Merge branch 'develop' into issue/missing-private-image-src

Vagrantfile

@@ -1,31 +1,55 @@
 
-server_ip = "192.168.22.10"
+server_ip_trusty = "192.168.22.10"
+server_ip_xenial = "192.168.22.11"
 server_memory = "1024" # MB
 server_timezone = "UTC"
 
 public_folder = "/vagrant"
 
 Vagrant.configure(2) do |config|
-
+######################################################################
   # Set server to Ubuntu 14.04
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.define "trusty" do |trusty|
+    trusty.vm.box = "ubuntu/trusty64"
 
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
+    # Disable automatic box update checking. If you disable this, then
+    # boxes will only be checked for updates when the user runs
+    # `vagrant box outdated`. This is not recommended.
+    # config.vm.box_check_update = false
 
-  # Create a hostname, don't forget to put it to the `hosts` file
-  # This will point to the server's default virtual host
-  # TO DO: Make this work with virtualhost along-side xip.io URL
-  config.vm.hostname = "friendica.dev"
+    # Create a hostname, don't forget to put it to the `hosts` file
+    # This will point to the server's default virtual host
+    # TO DO: Make this work with virtualhost along-side xip.io URL
+    trusty.vm.hostname = "friendica-trusty.dev"
 
-  # Create a static IP
-  config.vm.network :private_network, ip: server_ip
+    # Create a static IP
+    trusty.vm.network :private_network, ip: server_ip_trusty
+  end
 
+######################################################################
+  # Set server to Ubuntu 16.04
+  config.vm.define "xenial" do |xenial|
+    xenial.vm.box = "boxcutter/ubuntu1604"
+
+    # Disable automatic box update checking. If you disable this, then
+    # boxes will only be checked for updates when the user runs
+    # `vagrant box outdated`. This is not recommended.
+    # config.vm.box_check_update = false
+
+    # Create a hostname, don't forget to put it to the `hosts` file
+    # This will point to the server's default virtual host
+    # TO DO: Make this work with virtualhost along-side xip.io URL
+    xenial.vm.hostname = "friendica-xenial.dev"
+
+    # Create a static IP
+    xenial.vm.network :private_network, ip: server_ip_xenial
+  end
+
+######################################################################
   # Share a folder between host and guest
   config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
 
+
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   config.vm.provider "virtualbox" do |vb|

boot.php

@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1208      );
+define ( 'DB_UPDATE_VERSION',      1209      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -530,6 +530,7 @@ class App {
 	public	$videoheight = 350;
 	public	$force_max_items = 0;
 	public	$theme_thread_allow = true;
+	public	$theme_richtext_editor = true;
 	public	$theme_events_in_profile = true;
 
 	/**
@@ -609,6 +610,7 @@ class App {
 		$this->performance["markstart"] = microtime(true);
 
 		$this->callstack["database"] = array();
+		$this->callstack["database_write"] = array();
 		$this->callstack["network"] = array();
 		$this->callstack["file"] = array();
 		$this->callstack["rendering"] = array();
@@ -1384,6 +1386,10 @@ class App {
 
 	function proc_run($args) {
 
+		if (!function_exists("proc_open")) {
+			return;
+		}
+
 		// Add the php path if it is a php call
 		if (count($args) && ($args[0] === 'php' OR !is_string($args[0]))) {
 
@@ -2359,6 +2365,36 @@ function get_lockpath() {
 	return "";
 }
 
+/**
+ * @brief Returns the path where spool files are stored
+ *
+ * @return string Spool path
+ */
+function get_spoolpath() {
+	$spoolpath = get_config('system','spoolpath');
+	if (($spoolpath != "") AND is_dir($spoolpath) AND is_writable($spoolpath)) {
+		return($spoolpath);
+	}
+
+	$temppath = get_temppath();
+
+	if ($temppath != "") {
+		$spoolpath = $temppath."/spool";
+
+		if (!is_dir($spoolpath)) {
+			mkdir($spoolpath);
+		} elseif (!is_writable($spoolpath)) {
+			$spoolpath = $temppath;
+		}
+
+		if (is_dir($spoolpath) AND is_writable($spoolpath)) {
+			set_config("system", "spoolpath", $spoolpath);
+			return($spoolpath);
+		}
+	}
+	return "";
+}
+
 function get_temppath() {
 	$a = get_app();
 

convert_innodb.sql

@@ -1,19 +0,0 @@
-
-
-ALTER TABLE `profile` DROP INDEX `pub_keywords` ; 
-ALTER TABLE `profile` DROP INDEX `prv_keywords` ;
-
-ALTER TABLE `item` DROP INDEX `title` ;
-ALTER TABLE `item` DROP INDEX `body` ;
-ALTER TABLE `item` DROP INDEX `allow_cid` ;
-ALTER TABLE `item` DROP INDEX `allow_gid` ;
-ALTER TABLE `item` DROP INDEX `deny_cid` ;
-ALTER TABLE `item` DROP INDEX `deny_gid` ;
-ALTER TABLE `item` DROP INDEX `tag` ;
-ALTER TABLE `item` DROP INDEX `file` ;
-
-
-SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;') 
-FROM information_schema.tables 
-WHERE engine = 'MyISAM';
-

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.1-dev (Asparagus)
--- DB_UPDATE_VERSION 1205
+-- DB_UPDATE_VERSION 1208
 -- ------------------------------------------
 
 
@@ -59,7 +59,8 @@ CREATE TABLE IF NOT EXISTS `cache` (
 	`expire_mode` int(11) NOT NULL DEFAULT 0,
 	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	 PRIMARY KEY(`k`(191)),
-	 INDEX `updated` (`updated`)
+	 INDEX `updated` (`updated`),
+	 INDEX `expire_mode_updated` (`expire_mode`,`updated`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -174,6 +175,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`ffi_keyword_blacklist` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
+	 INDEX `addr_uid` (`addr`,`uid`),
 	 INDEX `nurl` (`nurl`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -201,7 +203,8 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
 	`cmd` varchar(32) NOT NULL DEFAULT '',
 	`item` int(11) NOT NULL DEFAULT 0,
 	`contact` int(11) NOT NULL DEFAULT 0,
-	 PRIMARY KEY(`id`)
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `cmd_item_contact` (`cmd`,`item`,`contact`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -656,7 +659,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`verb` varchar(255) NOT NULL DEFAULT '',
 	`otype` varchar(16) NOT NULL DEFAULT '',
 	`name_cache` tinytext,
-	`msg_name` mediumtext,
+	`msg_cache` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -739,7 +742,9 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`deny_cid` mediumtext,
 	`deny_gid` mediumtext,
 	 PRIMARY KEY(`id`),
-	 INDEX `uid` (`uid`),
+	 INDEX `uid_contactid` (`uid`,`contact-id`),
+	 INDEX `uid_profile` (`uid`,`profile`),
+	 INDEX `uid_album_created` (`uid`,`album`,`created`),
 	 INDEX `resource-id` (`resource-id`),
 	 INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -894,6 +899,7 @@ CREATE TABLE IF NOT EXISTS `register` (
 	`uid` int(11) unsigned NOT NULL DEFAULT 0,
 	`password` varchar(255) NOT NULL DEFAULT '',
 	`language` varchar(16) NOT NULL DEFAULT '',
+	`note` text,
 	 PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -974,6 +980,7 @@ CREATE TABLE IF NOT EXISTS `term` (
 	 INDEX `type_term` (`type`,`term`),
 	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
 	 INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
+	 INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`),
 	 INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
 

doc/BBCode.md

@@ -473,6 +473,10 @@ You can embed video, audio and more in a message.
   <td>[vimeo]Vimeo video ID[/vimeo]</td>
   <td>Vimeo player iframe embed.</td>
 </tr>
+<tr>
+  <td>[embed]URL[/embed]</td>
+  <td>Embed OEmbed rich content.</td>
+</tr>
 <tr>
   <td>[iframe]URL[/iframe]</td>
   <td>General embed, iframe size is limited by the theme size for video players.</td>

doc/Home.md

@@ -7,11 +7,11 @@ Friendica Documentation and Resources
 	* [Account Basics](help/Account-Basics)
 	* [New User Quick Start](help/Quick-Start-guide)
 	* [Creating posts](help/Text_editor)
-        * [BBCode tag reference](help/BBCode)
+	* [BBCode tag reference](help/BBCode)
 	* [Comment, sort and delete posts](help/Text_comment)
 	* [Profiles](help/Profiles)
 	* [Accesskey reference](help/Accesskeys)
-    * [Events](help/events)
+	* [Events](help/events)
 * You and other users
 	* [Connectors](help/Connectors)
 	* [Making Friends](help/Making-Friends)
@@ -31,9 +31,7 @@ Friendica Documentation and Resources
 * [Settings & Admin Panel](help/Settings)
 * [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
 * [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
-* [Message Flow](help/Message-Flow)
 * [Using SSL with Friendica](help/SSL)
-* [Twitter/GNU Social API Functions](help/api)
 * [Config values that can only be set in .htconfig.php](help/htconfig)
 
 **Developer Manual**
@@ -46,9 +44,11 @@ Friendica Documentation and Resources
 * [Plugin Development](help/Plugins)
 * [Theme Development](help/themes)
 * [Smarty 3 Templates](help/smarty3-templates)
+* [Protocol Documentation](help/Protocol)
 * [Database schema documantation](help/database)
 * [Class Autoloading](help/autoloader)
 * [Code - Reference(Doxygen generated - sets cookies)](doc/html/)
+* [Twitter/GNU Social API Functions](help/api)
 
 
 **External Resources**

doc/Message-Flow.md

@@ -4,7 +4,7 @@ Friendica Message Flow
 This page documents some of the details of how messages get from one person to another in the Friendica network.
 There are multiple paths, using multiple protocols and message formats.
 
-Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](http://dfrn.org/dfrn.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
+Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
 
 Most message passing involves the file include/items.php, which has functions for several feed-related import/export activities. 
 
@@ -21,8 +21,8 @@ Push (pubsubhubbub) feeds arrive via mod/pubsub.php
 
 DFRN-poll feed imports arrive via include/poller.php as a scheduled task, this implements the local side of the DFRN-poll protocol.  
 
-Scenario #1. Bob posts a public status message
----
+### Scenario #1. Bob posts a public status message
+
 This is a public message with no conversation members so no private transport is used.
 There are two paths it can take - as a bbcode path to DFRN clients, and converted to HTML with the server's PuSH (pubsubhubbub) hubs notified.
 When a PuSH hub is operational, dfrn-poll clients prefer to receive their information through the PuSH channel.
@@ -30,31 +30,31 @@ They will fall back on a daily poll in case the hub has delivery issues (this is
 If there is no specified hub or hubs, DFRN clients will poll at a configurable (per-contact) rate at up to 5-minute intervals.
 Feeds retrieved via dfrn-poll are bbcode and may also contain private conversations which the poller has permissions to see. 
 
-Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
----
+### Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
+
 Jack uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation using dfrn-notify.
 PuSH hubs are notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks). 
 
-Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
----
+### Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
+
 Mary uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation (excluding himself, the conversation is now sent to both Jack and Mary).
 Messages are sent using dfrn-notify.
 Push hubs are also notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
 
-Scenario #4. William replies to Bob's public message. William is on the OStatus network.
----
+### Scenario #4. William replies to Bob's public message. William is on the OStatus network.
+
 William uses salmon to notify Bob of the reply.
 Content is html embedded in salmon magic envelope.
 Bob then creates a feed of the conversation and sends it to all Friendica participants involved in the conversation using dfrn-notify (excluding himself, the conversation is sent to both Jack and Mary).
 Push hubs are notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
 
-Scenario #5. Bob posts a private message to Mary and Jack.
----
+### Scenario #5. Bob posts a private message to Mary and Jack.
+
 Message is delivered immediately to Mary and Jack using dfrn_notify.
 Public hubs are not notified.
 Requeueing is attempted in case of timeout.

doc/Protocol.md

@@ -0,0 +1,40 @@
+Used Protocols
+===============
+
+Friendicas DFRN Protocol
+---
+
+* [Document with the DFRN specification](spec/dfrn2.pdf)
+* [Schema of the contact request process](spec/dfrn2_contact_request.png)
+* [Schema of the contact request confirmation](spec/dfrn2_contact_confirmation.png)
+* [Description of the message flow](help/Message-Flow)
+
+ActivityStreams
+---
+
+Friendica is using ActivityStreams in version 1.0 for its activities and object types.
+Additional types are used for non standard activities.
+
+* [Link to the specification](http://activitystrea.ms/head/activity-schema.html)
+* [List of used ActivityStreams verbs and object types.](https://github.com/friendica/friendica/wiki/ActivityStreams)
+
+Salmon
+---
+
+Salmon is used as a message exchange protocol for replies and mentions.
+
+* [Link to the protocol summary](http://www.salmon-protocol.org/salmon-protocol-summary)
+
+Portable Contacts
+---
+
+Portable Contacts is used for friends lists.
+
+* [Link to the specification](https://web.archive.org/web/20160426223008/http://portablecontacts.net/draft-spec.html) (Link to archive.org)
+
+pubsubhubbub
+---
+
+pubsubhubbub is used for OStatus.
+
+* [Link to the specification](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html)

doc/SSL.md

@@ -5,7 +5,7 @@ Using SSL with Friendica
 
 Disclaimer
 ---
-**This document has been updated in November 2015.
+**This document has been updated in November 2016.
 SSL encryption is relevant for security.
 This means that recommended settings change fast.
 Keep your setup up to date and do not rely on this document being updated as fast as technologies change!**
@@ -40,65 +40,26 @@ If your Friendica instance is running on a shared hosting platform, you should f
 They have instructions for you on how to do it there.
 You can always order a paid certificate with your provider.
 They will either install it for you or provide an easy way to upload the certificate and the key via a web interface.
-
-
-It might be worth asking if your provider would install a certificate you provide yourself, to save money.
-If so, read on.
-
-Getting a free StartSSL certificate
----
-StartSSL is a certificate authority that issues certificates for free.
-They are valid for a year and are sufficient for our purposes.
-
-### Step 1: Create a client certificate
-
-When you initially sign up with StartSSL, you receive a certificate that is installed in your browser.
-You need it for the login on startssl.com, also when coming back to the site later.
-It has nothing to do with the SSL certificate for your server.
-
-### Step 2: Validate your email address and your domain
-
-To continue you have to prove that you own the email address you specified and the domain that you want a certificate for.
-Specify your email address, request a validation link via email from the "validations wizard".
-Same procedure for the domain validation.
-
-### Step 3: Request the certificate
-
-Go to the "certificates wizard".
-Choose the target web server.
-When you are first prompted for a domain to certify, you need to enter your main domain, e.g. example.com.
-In the next step, you will be able to specify a subdomain for Friendica, if needed.
-Example: If you have friendica.example.com, you first enter example.com, then specify the subdomain friendica later.
-
-If you know how to generate an openssl key and a certificate signing request (csr) yourself, do so.
-Paste the csr into your browser to get it signed by StartSSL.
-
-If you do not know how to generate a key and a csr, accept StartSSL's offer to generate it for you.
-This means: StartSSL has the key to your encryption but it is better than no certificate at all.
-Download your certificate from the website.
-(Or in the second case: Download your certificate and your key.)
-
-To install your certificate on a server, you need one or two extra files: sub.class1.server.ca.pem and ca.pem, delivered by startssl.com
-Go to the "Tool box" section and download "Class 1 Intermediate Server CA" and "StartCom Root CA (PEM encoded)".
-
-If you want to send your certificate to your hosting provider, they need the certificate, the key and probably at least the intermediate server CA.
-To be sure, send those three and the ca.pem file.
+With some providers, you have to send them your certificate.
+They need the certificate, the key and the CA's intermediate certificate.
+To be sure, send those three files.
 **You should send them to your provider via an encrypted channel!**
 
-If you run your own server, upload the files and check out the Mozilla wiki link below.
-
-Let's encrypt
+Own server
 ---
 
-If you run your own server, the "Let's encrypt" initiative might become an interesting alternative.
-Their offer is in public beta right now.
-Check out [their website](https://letsencrypt.org/) for status updates.
+If you run your own server, we recommend to check out the ["Let's Encrypt" initiative](https://letsencrypt.org/).
+Not only do they offer free SSL certificates, but also a way to automate their renewal.
+You need to install a client software on your server to use it.
+Instructions for the official client are [here](https://certbot.eff.org/).
+Depending on your needs, you might want to look at the [list of alternative letsencrypt clients](https://letsencrypt.org/docs/client-options/).
+
 
 Web server settings
 ---
 
 Visit the [Mozilla's wiki](https://wiki.mozilla.org/Security/Server_Side_TLS) for instructions on how to configure a secure webserver.
-They provide recommendations for [different web servers](https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_Server_Configurations).
+They provide recommendations for [different web servers](https://mozilla.github.io/server-side-tls/ssl-config-generator/).
 
 Test your SSL settings
 ---

doc/Vagrant.md

@@ -8,7 +8,11 @@ Getting started
 
 [Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers.
 No need to setup up a webserver, database etc. before actually starting.
-Vagrant creates a virtual machine (an Ubuntu 14.04) for you that you can just run inside VirtualBox and start to work directly on Friendica.
+Vagrant creates a virtual machine for you that you can just run inside VirtualBox and start to work directly on Friendica.
+You can choose between two different Ubuntu Linux versions:
+
+1. Ubuntu Trusty (14.04) with PHP 5.5.9 and MySQL 5.5.53
+2. Ubuntu Xenial (16.04) with PHP 7.0 and MySQL 5.7.16
 
 What you need to do:
 
@@ -16,21 +20,27 @@ What you need to do:
 Please use an up-to-date vagrant version from https://www.vagrantup.com/downloads.html.
 2. Git clone your Friendica repository.
 Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
-3. Run "vagrant up" from inside the friendica clone.
+3. Choose the Ubuntu version you'll need und run "vagrant up <ubuntu-version>" from inside the friendica clone:
+        $> vagrant up trusty
+        $> vagrant up xenial
 Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
-4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
-5. Open 192.168.22.10 in a browser.
+4. Run "vagrant ssh <ubuntu-version>" to log into the virtual machine to log in to the VM:
+        $> vagrant ssh trusty
+        $> vagrant ssh xenial
+5. Open you test installation in a browser.
+If you selected an Ubuntu Trusty go to 192.168.22.10.
+If you started a Xenial machine go to 192.168.22.11.
 The mysql database is called "friendica", the mysql user and password both are "root".
 6. Work on Friendica's code in your git clone on your machine (not in the VM).
 Your local working directory is set up as a shared directory with the VM (/vagrant).
 7. Check the changes in your browser in the VM.
-Debug via the "vagrant ssh" login.
+Debug via the "vagrant ssh <ubuntu-version>" login.
 Find the Friendica log file /vagrant/logfile.out.
 8. Commit and push your changes directly back to Github.
 
 If you want to stop vagrant after finishing your work, run the following command
 
-		$> vagrant halt
+		$> vagrant halt <ubuntu-version>
 
 in the development directory.
 
@@ -44,10 +54,3 @@ You will then have the following accounts to login:
   * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected. 
 
 For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
-
-**Important notice:**
-If you already had an Ubuntu 12.04 Vagrant VM, please run 
-
-	$> vagrant destroy
-
-before starting the new 14.04 machine.

doc/de/Home.md

@@ -26,32 +26,31 @@ Friendica - Dokumentation und Ressourcen
 	* [Bugs und Probleme](help/Bugs-and-Issues)
 	* [Häufig gestellte Fragen (FAQ)](help/FAQ)
  	
-**Technische Dokumentation**
+**Dokumentation für Administratoren**
 
 * [Installation](help/Install)
 * [Konfigurationen & Admin-Panel](help/Settings)
 * [Plugins](help/Plugins)
 * [Konnektoren (Connectors) installieren (Twitter/GNU Social)](help/Installing-Connectors)
 * [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
-* [Nachrichtenfluss](help/Message-Flow)
 * [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
-* [Entwickler](help/Developers)
-* [Twitter/GNU Social API Functions](help/api) (EN)
-* [Translation of Friendica](help/translations) (EN)
 * [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN)
 
-**Entwickler Dokumentation**
+**Dokumentation für Entwickler**
 
-* [Where to get started?](help/Developers-Intro)
+* [Entwickler](help/Developers)
+* [Where to get started?](help/Developers-Intro) (EN)
 * [Help on Github](help/Github)
 * [Help on Vagrant](help/Vagrant)
-* [How to translate Friendica](help/translations)
+* [How to translate Friendica](help/translations) (EN)
 * [Bugs and Issues](help/Bugs-and-Issues)
 * [Plugin Development](help/Plugins)
 * [Theme Development](help/themes)
 * [Smarty 3 Templates](help/smarty3-templates)
+* [Protokoll Dokumentation](help/Protocol) (EN)
 * [Datenbank-Schema](help/database)
 * [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
+* [Twitter/GNU Social API Functions](help/api) (EN)
 
 **Externe Ressourcen**
 

doc/de/Message-Flow.md

@@ -6,7 +6,7 @@ Friendica Nachrichtenfluss
 Diese Seite soll einige Infos darüber dokumentieren, wie Nachrichten innerhalb von Friendica von einer Person zur anderen übertragen werden. 
 Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate nutzen. 
 
-Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll (http://dfrn.org/dfrn.pdf) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
+Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
 
 Der Großteil der Nachrichtenverarbeitung nutzt die Datei include/items.php, welche Funktionen für verschiedene Feed-bezogene Import-/Exportaktivitäten liefert.
 
@@ -24,7 +24,7 @@ PuSh-Feeds (pubsubhubbub) kommen via mod/pubsub.php an.
 DFRN-poll Feed-Imports kommen via include/poller.php als geplanter Task an, das implementiert die lokale Bearbeitung (local side) des DFRN-Protokolls. 
 
 
-Szenario #1. Bob schreibt eine öffentliche Statusnachricht
+### Szenario #1. Bob schreibt eine öffentliche Statusnachricht
 
 Dies ist eine öffentliche Nachricht ohne begrenzte Nutzerfreigabe, so dass keine private Übertragung notwendig ist. 
 Es gibt zwei Wege, die genutzt werden können - als bbcode an DFRN-Clients oder als durch den Server konvertierten HTML-Code (mit PuSH; pubsubhubbub). 
@@ -33,13 +33,13 @@ Sie fallen zurück auf eine tägliche Abfrage, wenn der Hub Übertragungsschwier
 Wenn kein spezifizierter Hub oder Hubs ausgewählt sind, werden DFRN-Clients in einer pro Kontakt konfigurierbaren Rate mit bis zu 5-Minuten-Intervallen abfragen. 
 Feeds, die via DFRN-Poll abgerufen werden, sind bbcode und können auch private Unterhaltungen enthalten, die vom Poller auf ihre Zugriffsrechte hin geprüft werden.
 
-Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
+### Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
 
 Jack nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken. 
 Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist und dfrn-notify nutzt. 
 Die PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen diese an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
+### Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
 
 Mary nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken. 
 Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist (mit Ausnahme von Bob selbst; die Unterhaltung wird nun an Jack und Mary geschickt). 
@@ -47,14 +47,14 @@ Die Nachrichten werden mit dfrn-notify übertragen.
 PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. 
 Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
+### Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
 
 William nutzt salmon, um Bob über seine Antwort zu benachrichtigen. 
 Der Inhalt ist HTML-Code, der in das Salmon Magic Envelope eingebettet ist. 
 Bob erstellt dann einen Feed der Unterhaltung und sendet es an alle Friendica-Nutzer, die an der Unterhaltung beteiligt sind und dfrn-notify nutzen (mit Ausnahme von William selbst; die Unterhaltung wird an Jack und Mary weitergeleitet). 
 PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
+### Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
 
 Die Nachricht wird sofort an Mary und Jack mit Hilfe von dfrn_notify geschickt. 
 Öffentliche Hubs werden nicht benachrichtigt. 

doc/de/SSL.md

@@ -5,7 +5,7 @@ Friendica mit SSL nutzen
 
 Disclaimer
 ---
-**Dieses Dokument wurde im November 2015 aktualisiert.
+**Dieses Dokument wurde im November 2016 aktualisiert.
 SSL-Verschlüsselung ist sicherheitskritisch.
 Das bedeutet, dass sich die empfohlenen Einstellungen schnell verändern.
 Halte deine Installation auf dem aktuellen Stand und verlasse dich nicht darauf, dass dieses Dokument genau so schnell aktualisiert wird, wie sich Technologien verändern!**
@@ -45,55 +45,15 @@ Sie installieren es für dich oder haben in der Weboberfläche eine einfache Upl
 Um Geld zu sparen, kann es sich lohnen, dort auch nachzufragen, ob sie ein anderes Zertifikat, das du selbst beschaffst, für dich installieren würden.
 Wenn ja, dann lies weiter.
 
-Ein kostenloses StartSSL-Zertifikat besorgen
----
-
-StartSSL ist eine Zertifizierungsstelle, die kostenlose Zertifikate ausstellt.
-Sie sind für ein Jahr gültig und genügen für unsere Zwecke.
-
-### Schritt 1: Client-Zertifikat erstellen
-
-Wenn du dich erstmalig bei StartSSL anmeldest, erhältst du ein Zertifikat, das in deinem Browser installiert wird.
-Du brauchst es, um dich bei StartSSL einzuloggen, auch wenn du später wiederkommst.
-Dieses Client-Zertifikat hat nichts mit dem SSL-Zertifikat für deinen Server zu tun.
-
-### Schritt 2: Email-Adresse und Domain validieren
-
-Um fortzufahren musst du beweisen, dass du die Email-Adresse, die du angegeben hast, und die Domain, für die du das Zertifikat möchtest, besitzt.
-Gehe in den "Validation wizard" und fordere einen Bestätigungslink per Mail an.
-Dasselbe machst du auch für die Validierung der Domain.
-
-### Schritt 3: Das Zertifikat bestellen
-
-Gehe in den "Certificate wizard".
-Wähle das Target Webserver.
-Bei der ersten Abfrage der Domain gibst du deine Hauptdomain an.
-Im nächsten Schritt kannst du eine Subdomain hinzufügen.
-Ein Beispiel: Wenn die Adresse der Friendica-Instanz friendica.beispiel.net lautet, gibst du zuerst beispiel.net an und danach friendica.
-
-Wenn du weißt, wie man einen openssl-Schlüssel und einen Certificate Signing Request (CSR) erstellt, tu das.
-Kopiere den CSR in den Browser, um ihn von StartSSL signiert zu bekommen.
-
-Wenn du nicht weißt, wie man Schlüssel und CSR erzeugt, nimm das Angebot von StartSSL an, beides für dich zu generieren.
-Das bedeutet: StartSSL hat den Schlüssel zu deiner SSL-Verschlüsselung, aber das ist immer noch besser als gar kein Zertifikat.
-Lade dein Zertifikat von der Website herunter.
-(Oder im zweiten Fall: Lade Zertifikat und Schlüssel herunter.)
-
-Um dein Zertifikat auf einem Webserver zu installieren, brauchst du noch ein oder zwei andere Dateien: sub.class1.server.ca.pem und ca.pem, auch von StartSSL.
-Gehe in die Rubrik "Tool box" und lade "Class 1 Intermediate Server CA" und "StartCom Root CA (PEM encoded)" herunter.
-
-Wenn du dein Zertifikat zu deinem Hosting-Provider schicken möchtest, brauchen Sie mindestens Zertifikat und Schlüssel.
-Schick zur Sicherheit alle vier Dateien hin.
-**Du solltest sie auf einem verschlüsselten Weg hinschicken!**
-
-Wenn du deinen eigenen Server betreibst, lade die Dateien hoch und besuche das Mozilla-Wiki (Link unten).
 
 Let's encrypt
 ---
 
 Wenn du einen eigenen Server betreibst und den Nameserver kontrollierst, könnte auch die Initiative "Let's encrypt" interessant für dich werden.
-Momentan ist deren Angebot noch nicht fertig.
-Auf der [Website](https://letsencrypt.org/) kannst du dich über den Stand informieren.
+Sie bietet nicht nur freie SSL Zertifikate sondern auch einen automatisierten Prozess zum Erneuern der Zertifikate.
+Um letsencrypt Zertifikate verwenden zu können, musst du dir einen Client auf deinem Server installieren.
+Eine Anleitung zum offiziellen Client findet du [hier](https://certbot.eff.org/).
+Falls du dir andere Clients anschauen willst, kannst du einen Blick in diese [Liste von alternativen letsencrypt Clients](https://letsencrypt.org/docs/client-options/).
 
 Webserver-Einstellungen
 ---

doc/htconfig.md

@@ -29,6 +29,8 @@ Example: To set the directory value please add this line to your .htconfig.php:
 * disable_email_validation (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
 * disable_url_validation (Boolean) - Disables the DNS lookup of an URL.
 * event_input_format - Default value is "ymd".
+* frontend_worker (Boolean) - Activates the frontend worker which acts as a replacement for running the poller via the command line.
+* frontend_worker_timeout - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
 * ignore_cache (Boolean) - For development only. Disables the item cache.
 * like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked.
 * local_block (Boolean) - Used in conjunction with "block_public".

include/Contact.php

@@ -22,6 +22,7 @@ function user_remove($uid) {
 		$r[0]['nickname']
 	);
 
+	/// @todo Should be done in a background job since this likely will run into a time out
 	// don't delete yet, will be done later when contacts have deleted my stuff
 	// q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
@@ -74,25 +75,10 @@ function contact_remove($id) {
 		return;
 	}
 
-	q("DELETE FROM `contact` WHERE `id` = %d",
-		intval($id)
-	);
-	q("DELETE FROM `item` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `photo` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `mail` WHERE `contact-id` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `event` WHERE `cid` = %d ",
-		intval($id)
-	);
-	q("DELETE FROM `queue` WHERE `cid` = %d ",
-		intval($id)
-	);
+	q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
 
+	// Delete the rest in the background
+	proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
 }
 
 
@@ -145,7 +131,6 @@ function terminate_friendship($user,$self,$contact) {
 // This provides for the possibility that their database is temporarily messed
 // up or some other transient event and that there's a possibility we could recover from it.
 
-if(! function_exists('mark_for_death')) {
 function mark_for_death($contact) {
 
 	if($contact['archive'])
@@ -156,14 +141,24 @@ function mark_for_death($contact) {
 				dbesc(datetime_convert()),
 				intval($contact['id'])
 		);
-	}
-	else {
+
+		if ($contact['url'] != '') {
+			q("UPDATE `contact` SET `term-date` = '%s'
+				WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'",
+					dbesc(datetime_convert()),
+					dbesc(normalise_link($contact['url']))
+			);
+		}
+	} else {
 
 		/// @todo
 		/// We really should send a notification to the owner after 2-3 weeks
 		/// so they won't be surprised when the contact vanishes and can take
 		/// remedial action if this was a serious mistake or glitch
 
+		/// @todo
+		/// Check for contact vitality via probing
+
 		$expiry = $contact['term-date'] . ' + 32 days ';
 		if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
@@ -171,26 +166,45 @@ function mark_for_death($contact) {
 			// archive them rather than delete
 			// though if the owner tries to unarchive them we'll start the whole process over again
 
-			q("update contact set `archive` = 1 where id = %d",
+			q("UPDATE `contact` SET `archive` = 1 WHERE `id` = %d",
 				intval($contact['id'])
 			);
-			q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
-
-			//contact_remove($contact['id']);
 
+			if ($contact['url'] != '') {
+				q("UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'",
+					dbesc(normalise_link($contact['url']))
+				);
+			}
 		}
 	}
 
-}}
+}
 
-if(! function_exists('unmark_for_death')) {
 function unmark_for_death($contact) {
+
+	$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` > '%s'",
+		intval($contact['id']),
+		dbesc('1000-00-00 00:00:00')
+	);
+
+	// We don't need to update, we never marked this contact as dead
+	if (!dbm::is_result($r)) {
+		return;
+	}
+
 	// It's a miracle. Our dead contact has inexplicably come back to life.
 	q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
 		dbesc('0000-00-00 00:00:00'),
 		intval($contact['id'])
 	);
-}}
+
+	if ($contact['url'] != '') {
+		q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
+			dbesc('0000-00-00 00:00:00'),
+			dbesc(normalise_link($contact['url']))
+		);
+	}
+}
 
 /**
  * @brief Get contact data for a given profile link

include/ParseUrl.php

@@ -0,0 +1,552 @@
+<?php
+
+/**
+ * @file include/ParseUrl.php
+ * @brief Get informations about a given URL
+ */
+
+namespace Friendica;
+
+use \Friendica\Core\Config;
+
+require_once("include/network.php");
+require_once("include/Photo.php");
+require_once("include/oembed.php");
+require_once("include/xml.php");
+
+/**
+ * @brief Class with methods for extracting certain content from an url
+ */
+class ParseUrl {
+
+	/**
+	 * @brief Search for chached embeddable data of an url otherwise fetch it
+	 * 
+	 * @param type $url The url of the page which should be scraped
+	 * @param type $no_guessing If true the parse doens't search for
+	 *    preview pictures
+	 * @param type $do_oembed The false option is used by the function fetch_oembed()
+	 *    to avoid endless loops
+	 * 
+	 * @return array which contains needed data for embedding
+	 *    string 'url' => The url of the parsed page
+	 *    string 'type' => Content type
+	 *    string 'title' => The title of the content
+	 *    string 'text' => The description for the content
+	 *    string 'image' => A preview image of the content (only available
+	 *                if $no_geuessing = false
+	 *    array'images' = Array of preview pictures
+	 *    string 'keywords' => The tags which belong to the content
+	 * 
+	 * @see ParseUrl::getSiteinfo() for more information about scraping
+	 * embeddable content 
+	 */
+	public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true) {
+
+		if ($url == "") {
+			return false;
+		}
+
+		$r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
+			dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
+
+		if ($r) {
+			$data = $r[0]["content"];
+		}
+
+		if (!is_null($data)) {
+			$data = unserialize($data);
+			return $data;
+		}
+
+		$data = self::getSiteinfo($url, $no_guessing, $do_oembed);
+
+		q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')
+			 ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+			dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed),
+			dbesc(serialize($data)), dbesc(datetime_convert()),
+			dbesc(serialize($data)), dbesc(datetime_convert()));
+
+		return $data;
+	}
+	/**
+	 * @brief Parse a page for embeddable content information
+	 * 
+	 * This method parses to url for meta data which can be used to embed
+	 * the content. If available it prioritizes Open Graph meta tags.
+	 * If this is not available it uses the twitter cards meta tags.
+	 * As fallback it uses standard html elements with meta informations
+	 * like \<title\>Awesome Title\</title\> or
+	 * \<meta name="description" content="An awesome description"\>
+	 * 
+	 * @param type $url The url of the page which should be scraped
+	 * @param type $no_guessing If true the parse doens't search for
+	 *    preview pictures
+	 * @param type $do_oembed The false option is used by the function fetch_oembed()
+	 *    to avoid endless loops
+	 * @param type $count Internal counter to avoid endless loops
+	 * 
+	 * @return array which contains needed data for embedding
+	 *    string 'url' => The url of the parsed page
+	 *    string 'type' => Content type
+	 *    string 'title' => The title of the content
+	 *    string 'text' => The description for the content
+	 *    string 'image' => A preview image of the content (only available
+	 *                if $no_geuessing = false
+	 *    array'images' = Array of preview pictures
+	 *    string 'keywords' => The tags which belong to the content
+	 * 
+	 * @todo https://developers.google.com/+/plugins/snippet/
+	 * @verbatim
+	 * <meta itemprop="name" content="Awesome title">
+	 * <meta itemprop="description" content="An awesome description">
+	 * <meta itemprop="image" content="http://maple.libertreeproject.org/images/tree-icon.png">
+	 * 
+	 * <body itemscope itemtype="http://schema.org/Product">
+	 *   <h1 itemprop="name">Shiny Trinket</h1>
+	 *   <img itemprop="image" src="{image-url}" />
+	 *   <p itemprop="description">Shiny trinkets are shiny.</p>
+	 * </body>
+	 * @endverbatim
+	 */
+	public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
+
+		$a = get_app();
+
+		$siteinfo = array();
+
+		// Check if the URL does contain a scheme
+		$scheme = parse_url($url, PHP_URL_SCHEME);
+
+		if ($scheme == "") {
+			$url = "http://".trim($url, "/");
+		}
+
+		if ($count > 10) {
+			logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG);
+			return($siteinfo);
+		}
+
+		$url = trim($url, "'");
+		$url = trim($url, '"');
+
+		$url = original_url($url);
+
+		$siteinfo["url"] = $url;
+		$siteinfo["type"] = "link";
+
+		$check_cert = Config::get("system", "verifyssl");
+
+		$stamp1 = microtime(true);
+
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_HEADER, 1);
+		curl_setopt($ch, CURLOPT_NOBODY, 1);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 3);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+
+		$header = curl_exec($ch);
+		$curl_info = @curl_getinfo($ch);
+		$http_code = $curl_info["http_code"];
+		curl_close($ch);
+
+		$a->save_timestamp($stamp1, "network");
+
+		if ((($curl_info["http_code"] == "301") || ($curl_info["http_code"] == "302") || ($curl_info["http_code"] == "303") || ($curl_info["http_code"] == "307"))
+			&& (($curl_info["redirect_url"] != "") || ($curl_info["location"] != ""))) {
+			if ($curl_info["redirect_url"] != "") {
+				$siteinfo = self::getSiteinfo($curl_info["redirect_url"], $no_guessing, $do_oembed, ++$count);
+			} else {
+				$siteinfo = self::getSiteinfo($curl_info["location"], $no_guessing, $do_oembed, ++$count);
+			}
+			return($siteinfo);
+		}
+
+		// If the file is too large then exit
+		if ($curl_info["download_content_length"] > 1000000) {
+			return($siteinfo);
+		}
+
+		// If it isn't a HTML file then exit
+		if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]), "html")) {
+			return($siteinfo);
+		}
+
+		if ($do_oembed) {
+
+			$oembed_data = oembed_fetch_url($url);
+
+			if (!in_array($oembed_data->type, array("error", "rich"))) {
+				$siteinfo["type"] = $oembed_data->type;
+			}
+
+			if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) {
+				if (isset($oembed_data->title)) {
+					$siteinfo["title"] = $oembed_data->title;
+				}
+				if (isset($oembed_data->description)) {
+					$siteinfo["text"] = trim($oembed_data->description);
+				}
+				if (isset($oembed_data->thumbnail_url)) {
+					$siteinfo["image"] = $oembed_data->thumbnail_url;
+				}
+			}
+		}
+
+		$stamp1 = microtime(true);
+
+		// Now fetch the body as well
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_HEADER, 1);
+		curl_setopt($ch, CURLOPT_NOBODY, 0);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+
+		$header = curl_exec($ch);
+		$curl_info = @curl_getinfo($ch);
+		$http_code = $curl_info["http_code"];
+		curl_close($ch);
+
+		$a->save_timestamp($stamp1, "network");
+
+		// Fetch the first mentioned charset. Can be in body or header
+		$charset = "";
+		if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) {
+			$charset = trim(trim(trim(array_pop($matches)), ';,'));
+		}
+
+		if ($charset == "") {
+			$charset = "utf-8";
+		}
+
+		$pos = strpos($header, "\r\n\r\n");
+
+		if ($pos) {
+			$body = trim(substr($header, $pos));
+		} else {
+			$body = $header;
+		}
+
+		if (($charset != "") && (strtoupper($charset) != "UTF-8")) {
+			logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG);
+			//$body = mb_convert_encoding($body, "UTF-8", $charset);
+			$body = iconv($charset, "UTF-8//TRANSLIT", $body);
+		}
+
+		$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
+
+		$doc = new \DOMDocument();
+		@$doc->loadHTML($body);
+
+		\xml::deleteNode($doc, "style");
+		\xml::deleteNode($doc, "script");
+		\xml::deleteNode($doc, "option");
+		\xml::deleteNode($doc, "h1");
+		\xml::deleteNode($doc, "h2");
+		\xml::deleteNode($doc, "h3");
+		\xml::deleteNode($doc, "h4");
+		\xml::deleteNode($doc, "h5");
+		\xml::deleteNode($doc, "h6");
+		\xml::deleteNode($doc, "ol");
+		\xml::deleteNode($doc, "ul");
+
+		$xpath = new \DomXPath($doc);
+
+		$list = $xpath->query("//meta[@content]");
+		foreach ($list as $node) {
+			$attr = array();
+			if ($node->attributes->length) {
+				foreach ($node->attributes as $attribute) {
+					$attr[$attribute->name] = $attribute->value;
+				}
+			}
+
+			if (@$attr["http-equiv"] == "refresh") {
+				$path = $attr["content"];
+				$pathinfo = explode(";", $path);
+				$content = "";
+				foreach ($pathinfo as $value) {
+					if (substr(strtolower($value), 0, 4) == "url=") {
+						$content = substr($value, 4);
+					}
+				}
+				if ($content != "") {
+					$siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count);
+					return($siteinfo);
+				}
+			}
+		}
+
+		$list = $xpath->query("//title");
+		if ($list->length > 0) {
+			$siteinfo["title"] = $list->item(0)->nodeValue;
+		}
+
+		//$list = $xpath->query("head/meta[@name]");
+		$list = $xpath->query("//meta[@name]");
+		foreach ($list as $node) {
+			$attr = array();
+			if ($node->attributes->length) {
+				foreach ($node->attributes as $attribute) {
+					$attr[$attribute->name] = $attribute->value;
+				}
+			}
+
+			$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+
+			if ($attr["content"] != "") {
+				switch (strtolower($attr["name"])) {
+					case "fulltitle":
+						$siteinfo["title"] = $attr["content"];
+						break;
+					case "description":
+						$siteinfo["text"] = $attr["content"];
+						break;
+					case "thumbnail":
+						$siteinfo["image"] = $attr["content"];
+						break;
+					case "twitter:image":
+						$siteinfo["image"] = $attr["content"];
+						break;
+					case "twitter:image:src":
+						$siteinfo["image"] = $attr["content"];
+						break;
+					case "twitter:card":
+						if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
+							$siteinfo["type"] = $attr["content"];
+						}
+						break;
+					case "twitter:description":
+						$siteinfo["text"] = $attr["content"];
+						break;
+					case "twitter:title":
+						$siteinfo["title"] = $attr["content"];
+						break;
+					case "dc.title":
+						$siteinfo["title"] = $attr["content"];
+						break;
+					case "dc.description":
+						$siteinfo["text"] = $attr["content"];
+						break;
+					case "keywords":
+						$keywords = explode(",", $attr["content"]);
+						break;
+					case "news_keywords":
+						$keywords = explode(",", $attr["content"]);
+						break;
+				}
+			}
+			if ($siteinfo["type"] == "summary") {
+				$siteinfo["type"] = "link";
+			}
+		}
+
+		if (isset($keywords)) {
+			$siteinfo["keywords"] = array();
+			foreach ($keywords as $keyword) {
+				if (!in_array(trim($keyword), $siteinfo["keywords"])) {
+					$siteinfo["keywords"][] = trim($keyword);
+				}
+			}
+		}
+
+		//$list = $xpath->query("head/meta[@property]");
+		$list = $xpath->query("//meta[@property]");
+		foreach ($list as $node) {
+			$attr = array();
+			if ($node->attributes->length) {
+				foreach ($node->attributes as $attribute) {
+					$attr[$attribute->name] = $attribute->value;
+				}
+			}
+
+			$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+
+			if ($attr["content"] != "") {
+				switch (strtolower($attr["property"])) {
+					case "og:image":
+						$siteinfo["image"] = $attr["content"];
+						break;
+					case "og:title":
+						$siteinfo["title"] = $attr["content"];
+						break;
+					case "og:description":
+						$siteinfo["text"] = $attr["content"];
+						break;
+				}
+			}
+		}
+
+		if ((@$siteinfo["image"] == "") && !$no_guessing) {
+			$list = $xpath->query("//img[@src]");
+			foreach ($list as $node) {
+				$attr = array();
+				if ($node->attributes->length) {
+					foreach ($node->attributes as $attribute) {
+						$attr[$attribute->name] = $attribute->value;
+					}
+				}
+
+				$src = self::completeUrl($attr["src"], $url);
+				$photodata = get_photo_info($src);
+
+				if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
+					if ($photodata[0] > 300) {
+						$photodata[1] = round($photodata[1] * (300 / $photodata[0]));
+						$photodata[0] = 300;
+					}
+					if ($photodata[1] > 300) {
+						$photodata[0] = round($photodata[0] * (300 / $photodata[1]));
+						$photodata[1] = 300;
+					}
+					$siteinfo["images"][] = array("src" => $src,
+									"width" => $photodata[0],
+									"height" => $photodata[1]);
+				}
+
+				}
+		} elseif ($siteinfo["image"] != "") {
+			$src = self::completeUrl($siteinfo["image"], $url);
+
+			unset($siteinfo["image"]);
+
+			$photodata = get_photo_info($src);
+
+			if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
+				$siteinfo["images"][] = array("src" => $src,
+								"width" => $photodata[0],
+								"height" => $photodata[1]);
+			}
+		}
+
+		if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) {
+			$text = "";
+
+			$list = $xpath->query("//div[@class='article']");
+			foreach ($list as $node) {
+				if (strlen($node->nodeValue) > 40) {
+					$text .= " ".trim($node->nodeValue);
+				}
+			}
+
+			if ($text == "") {
+				$list = $xpath->query("//div[@class='content']");
+				foreach ($list as $node) {
+					if (strlen($node->nodeValue) > 40) {
+						$text .= " ".trim($node->nodeValue);
+					}
+				}
+			}
+
+			// If none text was found then take the paragraph content
+			if ($text == "") {
+				$list = $xpath->query("//p");
+				foreach ($list as $node) {
+					if (strlen($node->nodeValue) > 40) {
+						$text .= " ".trim($node->nodeValue);
+					}
+				}
+			}
+
+			if ($text != "") {
+				$text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text));
+
+				while (strpos($text, "  ")) {
+					$text = trim(str_replace("  ", " ", $text));
+				}
+
+				$siteinfo["text"] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8").'...');
+			}
+		}
+
+		logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
+
+		call_hooks("getsiteinfo", $siteinfo);
+
+		return($siteinfo);
+	}
+
+	/**
+	 * @brief Convert tags from CSV to an array
+	 * 
+	 * @param string $string Tags
+	 * @return array with formatted Hashtags
+	 */
+	public static function convertTagsToArray($string) {
+		$arr_tags = str_getcsv($string);
+		if (count($arr_tags)) {
+			// add the # sign to every tag
+			array_walk($arr_tags, array("self", "arrAddHashes"));
+
+			return $arr_tags;
+		}
+	}
+
+	/**
+	 * @brief Add a hasht sign to a string
+	 * 
+	 *  This method is used as callback function
+	 * 
+	 * @param string $tag The pure tag name
+	 * @param int $k Counter for internal use
+	 */
+	private static function arrAddHashes(&$tag, $k) {
+		$tag = "#" . $tag;
+	}
+
+	/**
+	 * @brief Add a scheme to an url
+	 * 
+	 * The src attribute of some html elements (e.g. images)
+	 * can miss the scheme so we need to add the correct
+	 * scheme
+	 * 
+	 * @param string $url The url which possibly does have
+	 *    a missing scheme (a link to an image)
+	 * @param string $scheme The url with a correct scheme
+	 *    (e.g. the url from the webpage which does contain the image)
+	 * 
+	 * @return string The url with a scheme
+	 */
+	private static function completeUrl($url, $scheme) {
+		$urlarr = parse_url($url);
+
+		// If the url does allready have an scheme
+		// we can stop the process here
+		if (isset($urlarr["scheme"])) {
+			return($url);
+		}
+
+		$schemearr = parse_url($scheme);
+
+		$complete = $schemearr["scheme"]."://".$schemearr["host"];
+
+		if (@$schemearr["port"] != "") {
+			$complete .= ":".$schemearr["port"];
+		}
+
+		if (strpos($urlarr["path"],"/") !== 0) {
+			$complete .= "/";
+		}
+
+		$complete .= $urlarr["path"];
+
+		if (@$urlarr["query"] != "") {
+			$complete .= "?".$urlarr["query"];
+		}
+
+		if (@$urlarr["fragment"] != "") {
+			$complete .= "#".$urlarr["fragment"];
+		}
+
+		return($complete);
+	}
+}

include/api.php

@@ -623,7 +623,7 @@
 		// count friends
 		$r = q("SELECT count(*) as `count` FROM `contact`
 				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
+				AND `self`=0 AND NOT `blocked` AND `hidden`=0",
 				intval($uinfo[0]['uid']),
 				intval(CONTACT_IS_SHARING),
 				intval(CONTACT_IS_FRIEND)
@@ -632,7 +632,7 @@
 
 		$r = q("SELECT count(*) as `count` FROM `contact`
 				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
+				AND `self`=0 AND NOT `blocked` AND `hidden`=0",
 				intval($uinfo[0]['uid']),
 				intval(CONTACT_IS_FOLLOWER),
 				intval(CONTACT_IS_FRIEND)
@@ -1399,7 +1399,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`uid` = %d AND `verb` = '%s'
 			AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
 			$sql_extra
@@ -1476,7 +1476,7 @@
 			`user`.`nickname`, `user`.`hidewall`
 			FROM `item`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
 				AND NOT `user`.`hidewall`
 			WHERE `verb` = '%s' AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
@@ -1543,7 +1543,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item`
 			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
 			AND `item`.`uid` = %d AND `item`.`verb` = '%s'
 			$sql_extra",
@@ -1619,7 +1619,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`parent` = %d AND `item`.`visible`
 			AND NOT `item`.`moderated` AND NOT `item`.`deleted`
 			AND `item`.`uid` = %d AND `item`.`verb` = '%s'
@@ -1673,7 +1673,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item`
 			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
 			AND NOT `item`.`private` AND `item`.`allow_cid` = '' AND `item`.`allow`.`gid` = ''
 			AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
@@ -1792,7 +1792,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item` FORCE INDEX (`uid_id`)
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`uid` = %d AND `verb` = '%s'
 			AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
 			AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
@@ -1866,7 +1866,7 @@
 			`contact`.`id` AS `cid`
 			FROM `item` FORCE INDEX (`uid_contactid_id`)
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			WHERE `item`.`uid` = %d AND `verb` = '%s'
 			AND `item`.`contact-id` = %d
 			AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
@@ -2002,7 +2002,7 @@
 				AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
 				AND `item`.`starred` = 1
 				AND `contact`.`id` = `item`.`contact-id`
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				$sql_extra
 				AND `item`.`id`>%d
 				ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
@@ -2436,18 +2436,18 @@
 							'religion' => $profile['religion'],
 							'public_keywords' => $profile['pub_keywords'],
 							'private_keywords' => $profile['prv_keywords'],
-							'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, true),
-							'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, true),
-							'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, true),
-							'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, true),
-							'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, true),
-							'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, true),
-							'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, true),
-							'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, true),
-							'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, true),
-							'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, true),
-							'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, true),
-							'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, true),
+							'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, false),
+							'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, false),
+							'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, false),
+							'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, false),
+							'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, false),
+							'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, false),
+							'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, false),
+							'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, false),
+							'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, false),
+							'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, false),
+							'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, false),
+							'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, false),
 							'homepage' => $profile['homepage'],
 							'users' => null);
 			return $profile;
@@ -2648,7 +2648,7 @@
 		if ($user_info['self'] == 0)
 			$sql_extra = " AND false ";
 
-		$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+		$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND (NOT `blocked` OR `pending`) $sql_extra",
 			intval(api_user())
 		);
 

include/cache.php

@@ -84,9 +84,14 @@ class Cache {
 		$memcache = self::memcache();
 		if (is_object($memcache)) {
 			// We fetch with the hostname as key to avoid problems with other applications
-			$value = $memcache->get(get_app()->get_hostname().":".$key);
-			if (!is_bool($value)) {
-				return unserialize($value);
+			$cached = $memcache->get(get_app()->get_hostname().":".$key);
+			$value = @unserialize($cached);
+
+			// Only return a value if the serialized value is valid.
+			// We also check if the db entry is a serialized
+			// boolean 'false' value (which we want to return).
+			if ($cached === serialize(false) || $value !== false) {
+				return $value;
 			}
 
 			return null;
@@ -100,7 +105,15 @@ class Cache {
 		);
 
 		if (dbm::is_result($r)) {
-			return unserialize($r[0]['v']);
+			$cached = $r[0]['v'];
+			$value = @unserialize($cached);
+
+			// Only return a value if the serialized value is valid.
+			// We also check if the db entry is a serialized
+			// boolean 'false' value (which we want to return).
+			if ($cached === serialize(false) || $value !== false) {
+				return $value;
+			}
 		}
 
 		return null;

include/conversation.php

@@ -439,7 +439,7 @@ These Fields are not added below (yet). They are here to for bug search.
 function item_joins() {
 
 	return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
-		NOT `contact`.`blocked` AND NOT `contact`.`pending`
+		(NOT `contact`.`blocked` OR `contact`.`pending`)
 		LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
 		LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`";
 }
@@ -1064,6 +1064,9 @@ function builtin_activity_puller($item, &$conv_responses) {
 			else
 				$conv_responses[$mode][$item['thr-parent']] ++;
 
+			if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
+				$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
+
 			$conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
 
 			// there can only be one activity verb per item so if we found anything, we can stop looking
@@ -1443,6 +1446,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
 		$ret[$v] = array();
 		$ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : '');
 		$ret[$v]['list']  = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : '');
+		$ret[$v]['self']  = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0');
 		if(count($ret[$v]['list']) > MAX_LIKERS) {
 			$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
 			array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'

include/cron.php

@@ -325,7 +325,7 @@ function cron_poll_contacts($argc, $argv) {
 
 			logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
 
-			if ($contact["remote_self"]) {
+			if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
 				proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
 			} else {
 				proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']);

include/dba.php

@@ -109,6 +109,17 @@ class dba {
 		return $return;
 	}
 
+	/**
+	 * @brief Returns the selected database name
+	 *
+	 * @return string
+	 */
+	public function database_name() {
+		$r = $this->q("SELECT DATABASE() AS `db`");
+
+		return $r[0]['db'];
+	}
+
 	/**
 	 * @brief Returns the number of rows
 	 *

include/dbstructure.php

@@ -1280,6 +1280,7 @@ function db_definition($charset) {
 					"uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
 					"password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
+					"note" => array("type" => "text"),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),

include/delivery.php

@@ -381,7 +381,14 @@ function delivery_run(&$argv, &$argc){
 				if ($deliver_status == (-1)) {
 					logger('notifier: delivery failed: queuing message');
 					add_to_queue($contact['id'],NETWORK_DFRN,$atom);
+
+					// The message could not be delivered. We mark the contact as "dead"
+					mark_for_death($contact);
+				} else {
+					// We successfully delivered a message, the contact is alive
+					unmark_for_death($contact);
 				}
+
 				break;
 
 			case NETWORK_OSTATUS:

include/dfrn.php

@@ -3,7 +3,8 @@
  * @file include/dfrn.php
  * @brief The implementation of the dfrn protocol
  *
- * https://github.com/friendica/friendica/wiki/Protocol
+ * @see https://github.com/friendica/friendica/wiki/Protocol and
+ * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
 
 require_once("include/Contact.php");
@@ -134,7 +135,7 @@ class dfrn {
 					break; // NOTREACHED
 			}
 
-			$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1",
+			$r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
 				intval($owner_id)
 			);
 
@@ -193,7 +194,7 @@ class dfrn {
 			`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
 			FROM `item` USE INDEX (`uid_wall_changed`, `uid_type_changed`) $sql_post_table
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND NOT `contact`.`blocked`
+			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
 			AND `item`.`wall` AND `item`.`changed` > '%s'

include/diaspora.php

@@ -999,17 +999,21 @@ class diaspora {
 	 */
 	private function author_contact_by_url($contact, $person, $uid) {
 
-		$r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc(normalise_link($person["url"])), intval($uid));
 		if ($r) {
 			$cid = $r[0]["id"];
 			$network = $r[0]["network"];
+
+			// We are receiving content from a user that is about to be terminated
+			// This means the user is vital, so we remove a possible termination date.
+			unmark_for_death($contact);
 		} else {
 			$cid = $contact["id"];
 			$network = NETWORK_DIASPORA;
 		}
 
-		return (array("cid" => $cid, "network" => $network));
+		return array("cid" => $cid, "network" => $network);
 	}
 
 	/**
@@ -2633,7 +2637,13 @@ class diaspora {
 			} else {
 				// queue message for redelivery
 				add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch);
+
+				// The message could not be delivered. We mark the contact as "dead"
+				mark_for_death($contact);
 			}
+		} elseif (($return_code >= 200) AND ($return_code <= 299)) {
+			// We successfully delivered a message, the contact is alive
+			unmark_for_death($contact);
 		}
 
 		return(($return_code) ? $return_code : (-1));

include/features.php

@@ -7,20 +7,27 @@
 
 /**
  * @brief check if feature is enabled
- * 
+ *
  * @return boolean
  */
-function feature_enabled($uid,$feature) {
+function feature_enabled($uid, $feature) {
 
-	$x = get_config('feature_lock',$feature);
-	if($x === false) {
-		$x = get_pconfig($uid,'feature',$feature);
-		if($x === false) {
-			$x = get_config('feature',$feature);
-			if($x === false)
+	if (($feature == 'richtext') AND !get_app()->theme_richtext_editor) {
+		return false;
+	}
+
+	$x = get_config('feature_lock', $feature);
+
+	if ($x === false) {
+		$x = get_pconfig($uid, 'feature', $feature);
+		if ($x === false) {
+			$x = get_config('feature', $feature);
+			if ($x === false) {
 				$x = get_feature_default($feature);
+			}
 		}
 	}
+
 	$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
 	call_hooks('feature_enabled',$arr);
 	return($arr['enabled']);
@@ -135,6 +142,11 @@ function get_features($filtered = true) {
 		}
 	}
 
+	// Remove the richtext editor setting if the theme doesn't support it
+	if (!get_app()->theme_richtext_editor) {
+		unset($arr['composition'][1]);
+	}
+
 	call_hooks('get_features',$arr);
 	return $arr;
 }

include/html2bbcode.php

@@ -1,11 +1,14 @@
 <?php
-/*
-html2bbcode.php
-Converter for HTML to BBCode
-Made by: ike@piratenpartei.de
-Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom
-					https://github.com/annando/Syncom
-*/
+/**
+ * @file include/html2bbcode.php
+ * @brief Converter for HTML to BBCode
+ * 
+ * Made by: ike@piratenpartei.de
+ * Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom
+ * 					https://github.com/annando/Syncom
+ */
+
+require_once("include/xml.php");
 
 function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
@@ -76,15 +79,6 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 	return($replace);
 }
 
-if(!function_exists('deletenode')) {
-function deletenode(&$doc, $node)
-{
-	$xpath = new DomXPath($doc);
-	$list = $xpath->query("//".$node);
-	foreach ($list as $child)
-		$child->parentNode->removeChild($child);
-}}
-
 function _replace_code_cb($m){
 	return "<code>".str_replace("\n","<br>\n",$m[1]). "</code>";
 }
@@ -117,12 +111,12 @@ function html2bbcode($message)
 
 	@$doc->loadHTML($message);
 
-	deletenode($doc, 'style');
-	deletenode($doc, 'head');
-	deletenode($doc, 'title');
-	deletenode($doc, 'meta');
-	deletenode($doc, 'xml');
-	deletenode($doc, 'removeme');
+	xml::deleteNode($doc, 'style');
+	xml::deleteNode($doc, 'head');
+	xml::deleteNode($doc, 'title');
+	xml::deleteNode($doc, 'meta');
+	xml::deleteNode($doc, 'xml');
+	xml::deleteNode($doc, 'removeme');
 
 	$xpath = new DomXPath($doc);
 	$list = $xpath->query("//pre");
@@ -239,7 +233,7 @@ function html2bbcode($message)
 	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
 	node2bbcode($doc, 'code', array(), '[code]', '[/code]');
-    node2bbcode($doc, 'key', array(), '[code]', '[/code]');
+	node2bbcode($doc, 'key', array(), '[code]', '[/code]');
 
 	$message = $doc->saveHTML();
 

include/identity.php

@@ -371,7 +371,7 @@ function profile_sidebar($profile, $block = 0) {
 			if(count($r))
 				$updated =  date("c", strtotime($r[0]['updated']));
 
-			$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+			$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
 					AND `network` IN ('%s', '%s', '%s', '')",
 				intval($profile['uid']),
 				dbesc(NETWORK_DFRN),

include/items.php

@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @file include/items.php
+ */
+
+use \Friendica\ParseUrl;
+
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/salmon.php');
@@ -216,9 +222,8 @@ function add_page_info_data($data) {
 }
 
 function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
-	require_once("mod/parse_url.php");
 
-	$data = parseurl_getsiteinfo_cached($url, true);
+	$data = ParseUrl::getSiteinfoCached($url, true);
 
 	if ($photo != "")
 		$data["images"][0]["src"] = $photo;
@@ -412,6 +417,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 	$dsprsig = null;
 	if (x($arr,'dsprsig')) {
+		$encoded_signature = $arr['dsprsig'];
 		$dsprsig = json_decode(base64_decode($arr['dsprsig']));
 		unset($arr['dsprsig']);
 	}
@@ -840,15 +846,27 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 	} else {
 		// This can happen - for example - if there are locking timeouts.
-		logger("Item wasn't stored - we quit here.");
-		q("COMMIT");
+		q("ROLLBACK");
+
+		// Store the data into a spool file so that we can try again later.
+
+		// At first we restore the Diaspora signature that we removed above.
+		if (isset($encoded_signature)) {
+			$arr['dsprsig'] = $encoded_signature;
+		}
+
+		// Now we store the data in the spool directory
+		$file = 'item-'.round(microtime(true) * 10000).".msg";
+		$spool = get_spoolpath().'/'.$file;
+		file_put_contents($spool, json_encode($arr));
+		logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
 		return 0;
 	}
 
 	if ($current_post == 0) {
 		// This is one of these error messages that never should occur.
 		logger("couldn't find created item - we better quit now.");
-		q("COMMIT");
+		q("ROLLBACK");
 		return 0;
 	}
 
@@ -863,7 +881,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	if (!dbm::is_result($r)) {
 		// This shouldn't happen, since COUNT always works when the database connection is there.
 		logger("We couldn't count the stored entries. Very strange ...");
-		q("COMMIT");
+		q("ROLLBACK");
 		return 0;
 	}
 
@@ -878,7 +896,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	} elseif ($r[0]["entries"] == 0) {
 		// This really should never happen since we quit earlier if there were problems.
 		logger("Something is terribly wrong. We haven't found our created entry.");
-		q("COMMIT");
+		q("ROLLBACK");
 		return 0;
 	}
 

include/oembed.php

@@ -1,8 +1,17 @@
 <?php
+
+/**
+ * @file include/oembed.php
+ */
+
+use \Friendica\ParseUrl;
+use \Friendica\Core\Config;
+
 function oembed_replacecb($matches){
 	$embedurl=$matches[1];
 	$j = oembed_fetch_url($embedurl);
 	$s =  oembed_format_object($j);
+
 	return $s;
 }
 
@@ -66,7 +75,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 		}
 
 		if ($txt==false || $txt=="") {
-			$embedly = get_config("system", "embedly");
+			$embedly = Config::get("system", "embedly");
 			if ($embedly != "") {
 				// try embedly service
 				$ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl);
@@ -110,8 +119,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 
 	// If fetching information doesn't work, then improve via internal functions
 	if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
-		require_once("mod/parse_url.php");
-		$data = parseurl_getsiteinfo_cached($embedurl, true, false);
+		$data = ParseUrl::getSiteinfoCached($embedurl, true, false);
 		$j->type = $data["type"];
 
 		if ($j->type == "photo") {
@@ -143,12 +151,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 function oembed_format_object($j){
 	require_once("mod/proxy.php");
 
-	$a = get_app();
 	$embedurl = $j->embedurl;
 	$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
 	$ret="<span class='oembed ".$j->type."'>";
 	switch ($j->type) {
-		case "video": {
+		case "video":
 			if (isset($j->thumbnail_url)) {
 				$tw = (isset($j->thumbnail_width) && intval($j->thumbnail_width)) ? $j->thumbnail_width:200;
 				$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
@@ -158,7 +165,7 @@ function oembed_format_object($j){
 				$th=120; $tw = $th*$tr;
 				$tpl=get_markup_template('oembed_video.tpl');
 				$ret.=replace_macros($tpl, array(
-				'$baseurl' => $a->get_baseurl(),
+					'$baseurl' => App::get_baseurl(),
 					'$embedurl'=>$embedurl,
 					'$escapedhtml'=>base64_encode($jhtml),
 					'$tw'=>$tw,
@@ -170,43 +177,49 @@ function oembed_format_object($j){
 				$ret=$jhtml;
 			}
 			//$ret.="<br>";
-		}; break;
-		case "photo": {
+			break;
+		case "photo":
 			$ret.= "<img width='".$j->width."' src='".proxy_url($j->url)."'>";
-		}; break;
-		case "link": {
-		}; break;
-		case "rich": {
+			break;
+		case "link":
+			break;
+		case "rich":
 			// not so safe..
-			if (!get_config("system","no_oembed_rich_content"))
+			if (!Config::get("system","no_oembed_rich_content")) {
 				$ret.= proxy_parse_html($jhtml);
-		}; break;
+			}
+			break;
 	}
 
 	// add link to source if not present in "rich" type
 	if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
 		$ret .= "<h4>";
 		if (isset($j->title)) {
-			if (isset($j->provider_name))
+			if (isset($j->provider_name)) {
 				$ret .= $j->provider_name.": ";
+			}
 
 			$embedlink = (isset($j->title))?$j->title:$embedurl;
 			$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
-			if (isset($j->author_name))
+			if (isset($j->author_name)) {
 				$ret.=" (".$j->author_name.")";
+			}
 		} elseif (isset($j->provider_name) OR isset($j->author_name)) {
 			$embedlink = "";
-			if (isset($j->provider_name))
+			if (isset($j->provider_name)) {
 				$embedlink .= $j->provider_name;
+			}
 
 			if (isset($j->author_name)) {
-				if ($embedlink != "")
+				if ($embedlink != "") {
 					$embedlink .= ": ";
+				}
 
 				$embedlink .= $j->author_name;
 			}
-			if (trim($embedlink) == "")
+			if (trim($embedlink) == "") {
 				$embedlink = $embedurl;
+			}
 
 			$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
 		}
@@ -247,15 +260,14 @@ function oembed_iframe($src, $width, $height) {
 	}
 	$width = '100%';
 
-	$a = get_app();
-	$s = $a->get_baseurl() . '/oembed/'.base64url_encode($src);
+	$s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
 	return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
 }
 
 
 
 function oembed_bbcode2html($text){
-	$stopoembed = get_config("system","no_oembed");
+	$stopoembed = Config::get("system","no_oembed");
 	if ($stopoembed == true){
 		return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
 	}
@@ -268,13 +280,13 @@ function oe_build_xpath($attr, $value){
 	return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";
 }
 
-function oe_get_inner_html( $node ) {
-    $innerHTML= '';
-    $children = $node->childNodes;
-    foreach ($children as $child) {
-        $innerHTML .= $child->ownerDocument->saveXML( $child );
-    }
-    return $innerHTML;
+function oe_get_inner_html($node) {
+	$innerHTML= '';
+	$children = $node->childNodes;
+	foreach ($children as $child) {
+		$innerHTML .= $child->ownerDocument->saveXML($child);
+	}
+	return $innerHTML;
 }
 
 /**
@@ -283,15 +295,16 @@ function oe_get_inner_html( $node ) {
  */
 function oembed_html2bbcode($text) {
 	// start parser only if 'oembed' is in text
-	if (strpos($text, "oembed")){
+	if (strpos($text, "oembed")) {
 
 		// convert non ascii chars to html entities
 		$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
 
 		// If it doesn't parse at all, just return the text.
 		$dom = @DOMDocument::loadHTML($html_text);
-		if(! $dom)
+		if (! $dom) {
 			return $text;
+		}
 		$xpath = new DOMXPath($dom);
 		$attr = "oembed";
 

include/plaintext.php

@@ -1,6 +1,15 @@
 <?php
 
+/**
+ * @file include/plaintext.php
+ */
+
+use \Friendica\ParseUrl;
+
 require_once("include/Photo.php");
+require_once("include/bbcode.php");
+require_once("include/html2plain.php");
+require_once("include/network.php");
 
 /**
  * @brief Fetches attachment data that were generated the old way
@@ -181,20 +190,17 @@ function get_attached_data($body) {
 
 	// if nothing is found, it maybe having an image.
 	if (!isset($post["type"])) {
-		require_once("mod/parse_url.php");
-		require_once("include/Photo.php");
-
 		$URLSearchString = "^\[\]";
 		if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures,  PREG_SET_ORDER)) {
 			if (count($pictures) == 1) {
 				// Checking, if the link goes to a picture
-				$data = parseurl_getsiteinfo_cached($pictures[0][1], true);
+				$data = ParseUrl::getSiteinfoCached($pictures[0][1], true);
 
 				// Workaround:
 				// Sometimes photo posts to the own album are not detected at the start.
 				// So we seem to cannot use the cache for these cases. That's strange.
 				if (($data["type"] != "photo") AND strstr($pictures[0][1], "/photos/"))
-					$data = parseurl_getsiteinfo($pictures[0][1], true);
+					$data = ParseUrl::getSiteinfo($pictures[0][1], true);
 
 				if ($data["type"] == "photo") {
 					$post["type"] = "photo";
@@ -246,8 +252,7 @@ function get_attached_data($body) {
 			$post["text"] = trim($body);
 		}
 	} elseif (isset($post["url"]) AND ($post["type"] == "video")) {
-		require_once("mod/parse_url.php");
-		$data = parseurl_getsiteinfo_cached($post["url"], true);
+		$data = ParseUrl::getSiteinfoCached($post["url"], true);
 
 		if (isset($data["images"][0]))
 			$post["image"] = $data["images"][0]["src"];
@@ -288,9 +293,6 @@ function shortenmsg($msg, $limit, $twitter = false) {
  * @return string The converted message
  */
 function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
-	require_once("include/bbcode.php");
-	require_once("include/html2plain.php");
-	require_once("include/network.php");
 
 	// Remove the hash tags
 	$URLSearchString = "^\[\]";

include/poller.php

@@ -15,7 +15,7 @@ use \Friendica\Core\PConfig;
 
 require_once("boot.php");
 
-function poller_run(&$argv, &$argc){
+function poller_run($argv, $argc){
 	global $a, $db;
 
 	if(is_null($a)) {
@@ -35,16 +35,21 @@ function poller_run(&$argv, &$argc){
 
 	$a->start_process();
 
-	$mypid = getmypid();
-
-	if ($a->max_processes_reached())
+	if (poller_max_connections_reached()) {
 		return;
+	}
 
-	if (poller_max_connections_reached())
+	if (App::maxload_reached()) {
 		return;
+	}
 
-	if (App::maxload_reached())
+	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+		poller_run_cron();
+	}
+
+	if ($a->max_processes_reached()) {
 		return;
+	}
 
 	// Checking the number of workers
 	if (poller_too_much_workers()) {
@@ -52,112 +57,18 @@ function poller_run(&$argv, &$argc){
 		return;
 	}
 
-	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
-		// Run the cron job that calls all other jobs
-		proc_run(PRIORITY_MEDIUM, "include/cron.php");
-
-		// Run the cronhooks job separately from cron for being able to use a different timing
-		proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
-
-		// Cleaning dead processes
-		poller_kill_stale_workers();
-	} else
-		// Sleep four seconds before checking for running processes again to avoid having too many workers
-		sleep(4);
-
-	// Checking number of workers
-	if (poller_too_much_workers())
-		return;
-
-	$cooldown = Config::get("system", "worker_cooldown", 0);
-
 	$starttime = time();
 
 	while ($r = poller_worker_process()) {
 
-		// Quit when in maintenance
-		if (get_config('system', 'maintenance', true))
-			return;
-
-		// Constantly check the number of parallel database processes
-		if ($a->max_processes_reached())
-			return;
-
-		// Constantly check the number of available database connections to let the frontend be accessible at any time
-		if (poller_max_connections_reached())
-			return;
-
 		// Count active workers and compare them with a maximum value that depends on the load
-		if (poller_too_much_workers())
+		if (poller_too_much_workers()) {
 			return;
-
-		$upd = q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `pid` = 0",
-			dbesc(datetime_convert()),
-			intval($mypid),
-			intval($r[0]["id"]));
-
-		if (!$upd) {
-			logger("Couldn't update queue entry ".$r[0]["id"]." - skip this execution", LOGGER_DEBUG);
-			q("COMMIT");
-			continue;
 		}
 
-		// Assure that there are no tasks executed twice
-		$id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-		if (!$id) {
-			logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
-			q("COMMIT");
-			continue;
-		} elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
-			logger("Entry for queue item ".$r[0]["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
-			q("COMMIT");
-			continue;
-		} elseif ($id[0]["pid"] != $mypid) {
-			logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
-			q("COMMIT");
-			continue;
+		if (!poller_execute($r[0])) {
+			return;
 		}
-		q("COMMIT");
-
-		$argv = json_decode($r[0]["parameter"]);
-
-		$argc = count($argv);
-
-		// Check for existance and validity of the include file
-		$include = $argv[0];
-
-		if (!validate_include($include)) {
-			logger("Include file ".$argv[0]." is not valid!");
-			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-			continue;
-		}
-
-		require_once($include);
-
-		$funcname = str_replace(".php", "", basename($argv[0]))."_run";
-
-		if (function_exists($funcname)) {
-			logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
-
-			// For better logging create a new process id for every worker call
-			// But preserve the old one for the worker
-			$old_process_id = $a->process_id;
-			$a->process_id = uniqid("wrk", true);
-
-			$funcname($argv, $argc);
-
-			$a->process_id = $old_process_id;
-
-			if ($cooldown > 0) {
-				logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
-				sleep($cooldown);
-			}
-
-			logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
-
-			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-		} else
-			logger("Function ".$funcname." does not exist");
 
 		// Quit the poller once every hour
 		if (time() > ($starttime + 3600))
@@ -166,6 +77,108 @@ function poller_run(&$argv, &$argc){
 
 }
 
+/**
+ * @brief Execute a worker entry
+ *
+ * @param array $queue Workerqueue entry
+ *
+ * @return boolean "true" if further processing should be stopped
+ */
+function poller_execute($queue) {
+
+	$a = get_app();
+
+	$mypid = getmypid();
+
+	$cooldown = Config::get("system", "worker_cooldown", 0);
+
+	// Quit when in maintenance
+	if (get_config('system', 'maintenance', true)) {
+		return false;
+	}
+
+	// Constantly check the number of parallel database processes
+	if ($a->max_processes_reached()) {
+		return false;
+	}
+
+	// Constantly check the number of available database connections to let the frontend be accessible at any time
+	if (poller_max_connections_reached()) {
+		return false;
+	}
+
+	$upd = q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `pid` = 0",
+		dbesc(datetime_convert()),
+		intval($mypid),
+		intval($queue["id"]));
+
+	if (!$upd) {
+		logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG);
+		q("COMMIT");
+		return true;
+	}
+
+	// Assure that there are no tasks executed twice
+	$id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+	if (!$id) {
+		logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG);
+		q("COMMIT");
+		return true;
+	} elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+		logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG);
+		q("COMMIT");
+		return true;
+	} elseif ($id[0]["pid"] != $mypid) {
+		logger("Queue item ".$queue["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
+		q("COMMIT");
+		return true;
+	}
+	q("COMMIT");
+
+	$argv = json_decode($queue["parameter"]);
+
+	$argc = count($argv);
+
+	// Check for existance and validity of the include file
+	$include = $argv[0];
+
+	if (!validate_include($include)) {
+		logger("Include file ".$argv[0]." is not valid!");
+		q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+		return true;
+	}
+
+	require_once($include);
+
+	$funcname = str_replace(".php", "", basename($argv[0]))."_run";
+
+	if (function_exists($funcname)) {
+		logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
+
+		// For better logging create a new process id for every worker call
+		// But preserve the old one for the worker
+		$old_process_id = $a->process_id;
+		$a->process_id = uniqid("wrk", true);
+
+		$funcname($argv, $argc);
+
+		$a->process_id = $old_process_id;
+
+		if ($cooldown > 0) {
+			logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+			sleep($cooldown);
+		}
+
+		logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done");
+
+		q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+	} else {
+		logger("Function ".$funcname." does not exist");
+	}
+
+	return true;
+}
+
 /**
  * @brief Checks if the number of database connections has reached a critical limit.
  *
@@ -177,9 +190,7 @@ function poller_max_connections_reached() {
 	$max = get_config("system", "max_connections");
 
 	// Fetch the percentage level where the poller will get active
-	$maxlevel = get_config("system", "max_connections_level");
-	if ($maxlevel == 0)
-		$maxlevel = 75;
+	$maxlevel = Config::get("system", "max_connections_level", 75);
 
 	if ($max == 0) {
 		// the maximum number of possible user connections can be a system variable
@@ -295,13 +306,13 @@ function poller_kill_stale_workers() {
 		}
 }
 
+/**
+ * @brief Checks if the number of active workers exceeds the given limits
+ *
+ * @return bool Are there too much workers running?
+ */
 function poller_too_much_workers() {
-
-
-	$queues = get_config("system", "worker_queues");
-
-	if ($queues == 0)
-		$queues = 4;
+	$queues = Config::get("system", "worker_queues", 4);
 
 	$maxqueues = $queues;
 
@@ -310,9 +321,7 @@ function poller_too_much_workers() {
 	// Decrease the number of workers at higher load
 	$load = current_load();
 	if($load) {
-		$maxsysload = intval(get_config('system','maxloadavg'));
-		if($maxsysload < 1)
-			$maxsysload = 50;
+		$maxsysload = intval(Config::get("system", "maxloadavg", 50));
 
 		$maxworkers = $queues;
 
@@ -373,6 +382,11 @@ function poller_too_much_workers() {
 	return($active >= $queues);
 }
 
+/**
+ * @brief Returns the number of active poller processes
+ *
+ * @return integer Number of active poller processes
+ */
 function poller_active_workers() {
 	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'");
 
@@ -394,8 +408,7 @@ function poller_passing_slow(&$highest_priority) {
 
 	$r = q("SELECT `priority`
 		FROM `process`
-		INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
-		WHERE `process`.`command` = 'poller.php'");
+		INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`");
 
 	// No active processes at all? Fine
 	if (!dbm::is_result($r))
@@ -435,7 +448,6 @@ function poller_passing_slow(&$highest_priority) {
  *
  * @return string SQL statement
  */
-
 function poller_worker_process() {
 
 	q("START TRANSACTION;");
@@ -464,6 +476,99 @@ function poller_worker_process() {
 	return $r;
 }
 
+/**
+ * @brief Call the front end worker
+ */
+function call_worker() {
+	if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+		return;
+	}
+
+	$url = get_app()->get_baseurl()."/worker";
+	fetch_url($url, false, $redirects, 1);
+}
+
+/**
+ * @brief Call the front end worker if there aren't any active
+ */
+function call_worker_if_idle() {
+	if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+		return;
+	}
+
+	// Do we have "proc_open"? Then we can fork the poller
+	if (function_exists("proc_open")) {
+		// When was the last time that we called the worker?
+		// Less than one minute? Then we quit
+		if ((time() - get_config("system", "worker_started")) < 60) {
+			return;
+		}
+
+		set_config("system", "worker_started", time());
+
+		// Do we have enough running workers? Then we quit here.
+		if (poller_too_much_workers()) {
+			// Cleaning dead processes
+			poller_kill_stale_workers();
+			get_app()->remove_inactive_processes();
+
+			return;
+		}
+
+		poller_run_cron();
+
+		logger('Call poller', LOGGER_DEBUG);
+
+		$args = array("php", "include/poller.php", "no_cron");
+		$a = get_app();
+		$a->proc_run($args);
+		return;
+	}
+
+	// We cannot execute background processes.
+	// We now run the processes from the frontend.
+	// This won't work with long running processes.
+	poller_run_cron();
+
+	clear_worker_processes();
+
+	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
+
+	if ($workers[0]["processes"] == 0) {
+		call_worker();
+	}
+}
+
+/**
+ * @brief Removes long running worker processes
+ */
+function clear_worker_processes() {
+	$timeout = Config::get("system", "frontend_worker_timeout", 10);
+
+	/// @todo We should clean up the corresponding workerqueue entries as well
+	q("DELETE FROM `process` WHERE `created` < '%s' AND `command` = 'worker.php'",
+		dbesc(datetime_convert('UTC','UTC',"now - ".$timeout." minutes")));
+}
+
+/**
+ * @brief Runs the cron processes
+ */
+function poller_run_cron() {
+	logger('Add cron entries', LOGGER_DEBUG);
+
+	// Check for spooled items
+	proc_run(PRIORITY_HIGH, "include/spool_post.php");
+
+	// Run the cron job that calls all other jobs
+	proc_run(PRIORITY_MEDIUM, "include/cron.php");
+
+	// Run the cronhooks job separately from cron for being able to use a different timing
+	proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
+
+	// Cleaning dead processes
+	poller_kill_stale_workers();
+}
+
 if (array_search(__file__,get_included_files())===0){
 	poller_run($_SERVER["argv"],$_SERVER["argc"]);
 

include/queue_fn.php

@@ -15,22 +15,35 @@ function remove_queue_item($id) {
 	);
 }
 
+/**
+ * @brief Checks if the communication with a given contact had problems recently
+ *
+ * @param int $cid Contact id
+ *
+ * @return bool The communication with this contact has currently problems
+ */
 function was_recently_delayed($cid) {
 
-	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
-		and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
+	$was_delayed = false;
+
+	// Are there queue entries that were recently added?
+	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
+		AND `last` > UTC_TIMESTAMP() - interval 15 minute LIMIT 1",
 		intval($cid)
 	);
-	if(count($r))
-		return true;
 
-	$r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
-		intval($cid)
-	);
-	if(count($r))
-		return true;
+	$was_delayed = dbm::is_result($r);
 
-	return false;
+	// We set "term-date" to a current date if the communication has problems.
+	// If the communication works again we reset this value.
+	if ($was_delayed) {
+		$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+			intval($cid)
+		);
+		$was_delayed = !dbm::is_result($r);
+	}
+
+	return $was_delayed;
 }
 
 

include/remove_contact.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @file include/remove_contact.php
+ * @brief Removes orphaned data from deleted contacts
+ */
+require_once("boot.php");
+
+function remove_contact_run($argv, $argc) {
+	global $a, $db;
+
+	if (is_null($a)) {
+		$a = new App;
+	}
+
+	if (is_null($db)) {
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	}
+
+	load_config('config');
+	load_config('system');
+
+	if ($argc != 2) {
+		return;
+	}
+
+	$id = intval($argv[1]);
+
+	// Only delete if the contact doesn't exist (anymore)
+	$r = q("SELECT `id` FROM `contact` WHERE `id` = %d", intval($id));
+	if (dbm::is_result($r)) {
+		return;
+	}
+
+	q("DELETE FROM `item` WHERE `contact-id` = %d", intval($id));
+
+	q("DELETE FROM `photo` WHERE `contact-id` = %d", intval($id));
+
+	q("DELETE FROM `mail` WHERE `contact-id` = %d", intval($id));
+
+	q("DELETE FROM `event` WHERE `cid` = %d", intval($id));
+
+	q("DELETE FROM `queue` WHERE `cid` = %d", intval($id));
+}
+
+if (array_search(__file__, get_included_files()) === 0) {
+	remove_contact_run($_SERVER["argv"], $_SERVER["argc"]);
+	killme();
+}
+?>

include/socgraph.php

@@ -1079,10 +1079,12 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		return array();
 	}
 
-	$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
-	if (!is_null($list)) {
-		return $list;
-	}
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//	$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+//	if (!is_null($list)) {
+//		return $list;
+//	}
 
 	$network = array(NETWORK_DFRN);
 
@@ -1116,7 +1118,10 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 	);
 
 	if (count($r) && count($r) >= ($limit -1)) {
-		Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//		Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+
 		return $r;
 	}
 
@@ -1147,7 +1152,9 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 	while (sizeof($list) > ($limit))
 		array_pop($list);
 
-	Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
+// Uncommented because the result of the queries are to big to store it in the cache.
+// We need to decide if we want to change the db column type or if we want to delete it.
+//	Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
 	return $list;
 }
 

include/spool_post.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * @file include/spool_post.php
+ * @brief Posts items that wer spooled because they couldn't be posted.
+ */
+require_once("boot.php");
+require_once("include/items.php");
+
+function spool_post_run($argv, $argc) {
+	global $a, $db;
+
+	if (is_null($a)) {
+		$a = new App;
+	}
+
+	if (is_null($db)) {
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	}
+
+	load_config('config');
+	load_config('system');
+
+	$path = get_spoolpath();
+
+	if (is_writable($path)){
+		if ($dh = opendir($path)) {
+			while (($file = readdir($dh)) !== false) {
+				$fullfile = $path."/".$file;
+				if (filetype($fullfile) != "file") {
+					continue;
+				}
+				$arr = json_decode(file_get_contents($fullfile), true);
+				$result = item_store($arr);
+				logger("Spool file ".$file." stored: ".$result, LOGGER_DEBUG);
+				unlink($fullfile);
+			}
+			closedir($dh);
+		}
+	}
+}
+
+if (array_search(__file__, get_included_files()) === 0) {
+	spool_post_run($_SERVER["argv"], $_SERVER["argc"]);
+	killme();
+}
+?>

include/text.php

@@ -12,7 +12,7 @@ if(! function_exists('replace_macros')) {
  * This is our template processor
  *
  * @param string|FriendicaSmarty $s the string requiring macro substitution,
- *									or an instance of FriendicaSmarty
+ *				or an instance of FriendicaSmarty
  * @param array $r key value pairs (search => replace)
  * @return string substituted string
  */
@@ -874,8 +874,8 @@ function contact_block() {
 	if((! is_array($a->profile)) || ($a->profile['hide-friends']))
 		return $o;
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
-			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0
-				AND `hidden` = 0 AND `archive` = 0
+			WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
+				AND NOT `hidden` AND NOT `archive`
 				AND `network` IN ('%s', '%s', '%s')",
 			intval($a->profile['uid']),
 			dbesc(NETWORK_DFRN),
@@ -892,7 +892,7 @@ function contact_block() {
 	} else {
 		// Splitting the query in two parts makes it much faster
 		$r = q("SELECT `id` FROM `contact`
-				WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending`
+				WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
 					AND NOT `hidden` AND NOT `archive`
 				AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
 				intval($a->profile['uid']),

include/user.php

@@ -378,6 +378,29 @@ function create_user($arr) {
 }
 
 
+/**
+ * @brief send registration confiŕmation with the intormation that reg is pending
+ *
+ * @param string $email
+ * @param string $sitename
+ * @param string $username
+ * @return NULL|boolean from notification() and email() inherited 
+ */
+function send_register_pending_eml($email, $sitename, $username) {
+	$body = deindent(t('
+		Dear %1$s,
+			Thank you for registering at %2$s. Your account is pending for approval by the administrator.
+	'));
+
+	$body = sprintf($body, $username, $sitename);
+
+	return notification(array(
+		'type' => "SYSTEM_EMAIL",
+		'to_email' => $email,
+		'subject'=> sprintf( t('Registration at %s'), $sitename),
+		'body' => $body));
+}
+
 /*
  * send registration confirmation.
  * It's here as a function because the mail is sent

include/xml.php

@@ -1,11 +1,12 @@
 <?php
+
 /**
  * @file include/xml.php
  */
 
 
 /**
- * @brief This class contain functions to work with XML data
+ * @brief This class contain methods to work with XML data
  *
  */
 class xml {
@@ -23,15 +24,17 @@ class xml {
 	public static function from_array($array, &$xml, $remove_header = false, $namespaces = array(), $root = true) {
 
 		if ($root) {
-			foreach($array as $key => $value) {
-				foreach ($namespaces AS $nskey => $nsvalue)
+			foreach ($array as $key => $value) {
+				foreach ($namespaces AS $nskey => $nsvalue) {
 					$key .= " xmlns".($nskey == "" ? "":":").$nskey.'="'.$nsvalue.'"';
+				}
 
 				if (is_array($value)) {
 					$root = new SimpleXMLElement("<".$key."/>");
 					self::from_array($value, $root, $remove_header, $namespaces, false);
-				} else
+				} else {
 					$root = new SimpleXMLElement("<".$key.">".xmlify($value)."</".$key.">");
+				}
 
 				$dom = dom_import_simplexml($root)->ownerDocument;
 				$dom->formatOutput = true;
@@ -39,16 +42,18 @@ class xml {
 
 				$xml_text = $dom->saveXML();
 
-				if ($remove_header)
+				if ($remove_header) {
 					$xml_text = trim(substr($xml_text, 21));
+				}
 
 				return $xml_text;
 			}
 		}
 
 		foreach($array as $key => $value) {
-			if (!isset($element) AND isset($xml))
+			if (!isset($element) AND isset($xml)) {
 				$element = $xml;
+			}
 
 			if (is_integer($key)) {
 				if (isset($element)) {
@@ -62,27 +67,31 @@ class xml {
 			}
 
 			$element_parts = explode(":", $key);
-			if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
+			if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
 				$namespace = $namespaces[$element_parts[0]];
-			elseif (isset($namespaces[""])) {
+			} elseif (isset($namespaces[""])) {
 				$namespace = $namespaces[""];
-			} else
+			} else {
 				$namespace = NULL;
+			}
 
 			// Remove undefined namespaces from the key
-			if ((count($element_parts) > 1) AND is_null($namespace))
+			if ((count($element_parts) > 1) AND is_null($namespace)) {
 				$key = $element_parts[1];
+			}
 
 			if (substr($key, 0, 11) == "@attributes") {
-				if (!isset($element) OR !is_array($value))
+				if (!isset($element) OR !is_array($value)) {
 					continue;
+				}
 
 				foreach ($value as $attr_key => $attr_value) {
 					$element_parts = explode(":", $attr_key);
-					if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
+					if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) {
 						$namespace = $namespaces[$element_parts[0]];
-					else
+					} else {
 						$namespace = NULL;
+					}
 
 					$element->addAttribute($attr_key, $attr_value, $namespace);
 				}
@@ -90,9 +99,9 @@ class xml {
 				continue;
 			}
 
-			if (!is_array($value))
+			if (!is_array($value)) {
 				$element = $xml->addChild($key, xmlify($value), $namespace);
-			elseif (is_array($value)) {
+			} elseif (is_array($value)) {
 				$element = $xml->addChild($key, NULL, $namespace);
 				self::from_array($value, $element, $remove_header, $namespaces, false);
 			}
@@ -111,8 +120,9 @@ class xml {
 			$target->addChild($elementname, xmlify($source));
 		else {
 			$child = $target->addChild($elementname);
-			foreach ($source->children() AS $childfield => $childentry)
+			foreach ($source->children() AS $childfield => $childentry) {
 				self::copy($childentry, $child, $childfield);
+			}
 		}
 	}
 
@@ -168,11 +178,11 @@ class xml {
 			return(null);
 		}
 
-		if (!is_string($xml_element) &&
-		!is_array($xml_element) &&
-		(get_class($xml_element) == 'SimpleXMLElement')) {
-			$xml_element_copy = $xml_element;
-			$xml_element = get_object_vars($xml_element);
+		if (!is_string($xml_element)
+			&& !is_array($xml_element)
+			&& (get_class($xml_element) == 'SimpleXMLElement')) {
+				$xml_element_copy = $xml_element;
+				$xml_element = get_object_vars($xml_element);
 		}
 
 		if (is_array($xml_element)) {
@@ -181,7 +191,7 @@ class xml {
 				return (trim(strval($xml_element_copy)));
 			}
 
-			foreach($xml_element as $key=>$value) {
+			foreach ($xml_element as $key => $value) {
 
 				$recursion_depth++;
 				$result_array[strtolower($key)] =
@@ -223,10 +233,12 @@ class xml {
 	 *
 	 * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure.
 	 */
-	public static function to_array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {
-		if(!$contents) return array();
+	public static function to_array($contents, $namespaces = true, $get_attributes = 1, $priority = 'attribute') {
+		if (!$contents) {
+			return array();
+		}
 
-		if(!function_exists('xml_parser_create')) {
+		if (!function_exists('xml_parser_create')) {
 			logger('xml::to_array: parser function missing');
 			return array();
 		}
@@ -235,12 +247,13 @@ class xml {
 		libxml_use_internal_errors(true);
 		libxml_clear_errors();
 
-		if($namespaces)
+		if ($namespaces) {
 			$parser = @xml_parser_create_ns("UTF-8",':');
-		else
+		} else {
 			$parser = @xml_parser_create();
+		}
 
-		if(! $parser) {
+		if (! $parser) {
 			logger('xml::to_array: xml_parser_create: no resource');
 			return array();
 		}
@@ -252,10 +265,11 @@ class xml {
 		@xml_parse_into_struct($parser, trim($contents), $xml_values);
 		@xml_parser_free($parser);
 
-		if(! $xml_values) {
+		if (! $xml_values) {
 			logger('xml::to_array: libxml: parse error: ' . $contents, LOGGER_DATA);
-			foreach(libxml_get_errors() as $err)
+			foreach (libxml_get_errors() as $err) {
 				logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA);
+			}
 			libxml_clear_errors();
 			return;
 		}
@@ -270,8 +284,8 @@ class xml {
 
 		// Go through the tags.
 		$repeated_tag_index = array(); // Multiple tags with same name will be turned into an array
-		foreach($xml_values as $data) {
-			unset($attributes,$value); // Remove existing values, or there will be trouble
+		foreach ($xml_values as $data) {
+			unset($attributes, $value); // Remove existing values, or there will be trouble
 
 			// This command will extract these variables into the foreach scope
 			// tag(string), type(string), level(int), attributes(array).
@@ -280,46 +294,54 @@ class xml {
 			$result = array();
 			$attributes_data = array();
 
-			if(isset($value)) {
-				if($priority == 'tag') $result = $value;
-				else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
+			if (isset($value)) {
+				if ($priority == 'tag') {
+					$result = $value;
+				} else {
+					$result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
+				}
 			}
 
 			//Set the attributes too.
-			if(isset($attributes) and $get_attributes) {
-				foreach($attributes as $attr => $val) {
-					if($priority == 'tag') $attributes_data[$attr] = $val;
-					else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr'
+			if (isset($attributes) and $get_attributes) {
+				foreach ($attributes as $attr => $val) {
+					if($priority == 'tag') {
+						$attributes_data[$attr] = $val;
+					} else {
+						$result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr'
+					}
 				}
 			}
 
 			// See tag status and do the needed.
-			if($namespaces && strpos($tag,':')) {
-				$namespc = substr($tag,0,strrpos($tag,':'));
-				$tag = strtolower(substr($tag,strlen($namespc)+1));
+			if ($namespaces && strpos($tag, ':')) {
+				$namespc = substr($tag, 0, strrpos($tag, ':'));
+				$tag = strtolower(substr($tag, strlen($namespc)+1));
 				$result['@namespace'] = $namespc;
 			}
 			$tag = strtolower($tag);
 
-			if($type == "open") {   // The starting of the tag '<tag>'
+			if ($type == "open") {   // The starting of the tag '<tag>'
 				$parent[$level-1] = &$current;
-				if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
+				if (!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
 					$current[$tag] = $result;
-					if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
+					if ($attributes_data) {
+						$current[$tag. '_attr'] = $attributes_data;
+					}
 					$repeated_tag_index[$tag.'_'.$level] = 1;
 
 					$current = &$current[$tag];
 
 				} else { // There was another element with the same tag name
 
-					if(isset($current[$tag][0])) { // If there is a 0th element it is already an array
+					if (isset($current[$tag][0])) { // If there is a 0th element it is already an array
 						$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 						$repeated_tag_index[$tag.'_'.$level]++;
 					} else { // This section will make the value an array if multiple tags with the same name appear together
-						$current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array
+						$current[$tag] = array($current[$tag], $result); // This will combine the existing item and the new item together to make an array
 						$repeated_tag_index[$tag.'_'.$level] = 2;
 
-						if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
+						if (isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
 							$current[$tag]['0_attr'] = $current[$tag.'_attr'];
 							unset($current[$tag.'_attr']);
 						}
@@ -329,35 +351,37 @@ class xml {
 					$current = &$current[$tag][$last_item_index];
 				}
 
-			} elseif($type == "complete") { // Tags that ends in 1 line '<tag />'
+			} elseif ($type == "complete") { // Tags that ends in 1 line '<tag />'
 				//See if the key is already taken.
-				if(!isset($current[$tag])) { //New Key
+				if (!isset($current[$tag])) { //New Key
 					$current[$tag] = $result;
 					$repeated_tag_index[$tag.'_'.$level] = 1;
-					if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
+					if ($priority == 'tag' and $attributes_data) {
+						$current[$tag. '_attr'] = $attributes_data;
+					}
 
 				} else { // If taken, put all things inside a list(array)
-					if(isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array...
+					if (isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array...
 
 						// ...push the new element into that array.
 						$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 
-						if($priority == 'tag' and $get_attributes and $attributes_data) {
+						if ($priority == 'tag' and $get_attributes and $attributes_data) {
 							$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
 						}
 						$repeated_tag_index[$tag.'_'.$level]++;
 
 					} else { // If it is not an array...
-						$current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
+						$current[$tag] = array($current[$tag], $result); //...Make it an array using using the existing value and the new value
 						$repeated_tag_index[$tag.'_'.$level] = 1;
-						if($priority == 'tag' and $get_attributes) {
-							if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
+						if ($priority == 'tag' and $get_attributes) {
+							if (isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
 
 								$current[$tag]['0_attr'] = $current[$tag.'_attr'];
 								unset($current[$tag.'_attr']);
 							}
 
-							if($attributes_data) {
+							if ($attributes_data) {
 								$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
 							}
 						}
@@ -365,12 +389,25 @@ class xml {
 					}
 				}
 
-			} elseif($type == 'close') { // End of tag '</tag>'
+			} elseif ($type == 'close') { // End of tag '</tag>'
 				$current = &$parent[$level-1];
 			}
 		}
 
 		return($xml_array);
 	}
+
+	/**
+	 * @brief Delete a node in a XML object
+	 * 
+	 * @param object $doc XML document
+	 * @param string $node Node name
+	 */
+	public static function deleteNode(&$doc, $node) {
+		$xpath = new DomXPath($doc);
+		$list = $xpath->query("//".$node);
+		foreach ($list as $child) {
+			$child->parentNode->removeChild($child);
+		}
+	}
 }
-?>

index.php

@@ -99,6 +99,10 @@ if (!$a->is_backend()) {
 	$stamp1 = microtime(true);
 	session_start();
 	$a->save_timestamp($stamp1, "parser");
+} else {
+	require_once "include/poller.php";
+
+	call_worker_if_idle();
 }
 
 /**

js/autocomplete.js

@@ -296,7 +296,7 @@ function string2bb(element) {
 	$.fn.bbco_autocomplete = function(type) {
 
 		if(type=='bbcode') {
-			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
+			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
 			var open_elements = ['*', 'hr'];
 
 			var elements = open_close_elements.concat(open_elements);

js/country.js

@@ -44,7 +44,7 @@ aStates[20]="|Brestskaya (Brest)|Homyel'skaya (Homyel')|Horad Minsk|Hrodzyenskay
 aStates[21]="|Antwerpen|Brabant Wallon|Brussels Capitol Region|Hainaut|Liege|Limburg|Luxembourg|Namur|Oost-Vlaanderen|Vlaams Brabant|West-Vlaanderen";
 aStates[22]="|Belize|Cayo|Corozal|Orange Walk|Stann Creek|Toledo";
 aStates[23]="|Alibori|Atakora|Atlantique|Borgou|Collines|Couffo|Donga|Littoral|Mono|Oueme|Plateau|Zou";
-aStates[24]="|Devonshire|Hamilton|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
+aStates[24]="|Devonshire|Hamilton (City)|Hamilton|Paget|Pembroke|Saint George|Saint Georges|Sandys|Smiths|Southampton|Warwick";
 aStates[25]="|Bumthang|Chhukha|Chirang|Daga|Geylegphug|Ha|Lhuntshi|Mongar|Paro|Pemagatsel|Punakha|Samchi|Samdrup Jongkhar|Shemgang|Tashigang|Thimphu|Tongsa|Wangdi Phodrang";
 aStates[26]="|Beni|Chuquisaca|Cochabamba|La Paz|Oruro|Pando|Potosi|Santa Cruz|Tarija";
 aStates[27]="|Federation of Bosnia and Herzegovina|Republika Srpska";
@@ -125,7 +125,7 @@ aStates[99]="|Holy See (Vatican City)"
 aStates[100]="|Atlantida|Choluteca|Colon|Comayagua|Copan|Cortes|El Paraiso|Francisco Morazan|Gracias a Dios|Intibuca|Islas de la Bahia|La Paz|Lempira|Ocotepeque|Olancho|Santa Barbara|Valle|Yoro";
 aStates[101]="|Hong Kong";
 aStates[102]="|Howland Island";
-aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem|Zala|Zalaegerszeg";
+aStates[103]="|Bacs-Kiskun|Baranya|Bekes|Bekescsaba|Borsod-Abauj-Zemplen|Budapest|Csongrad|Debrecen|Dunaujvaros|Eger|Fejer|Gyor|Gyor-Moson-Sopron|Hajdu-Bihar|Heves|Hodmezovasarhely|Jasz-Nagykun-Szolnok|Kaposvar|Kecskemet|Komarom-Esztergom|Miskolc|Nagykanizsa|Nograd|Nyiregyhaza|Pecs|Pest|Somogy|Sopron|Szabolcs-Szatmar-Bereg|Szeged|Szekesfehervar|Szolnok|Szombathely|Tatabanya|Tolna|Vas|Veszprem|Veszprem (City)|Zala|Zalaegerszeg";
 aStates[104]="|Akranes|Akureyri|Arnessysla|Austur-Bardhastrandarsysla|Austur-Hunavatnssysla|Austur-Skaftafellssysla|Borgarfjardharsysla|Dalasysla|Eyjafjardharsysla|Gullbringusysla|Hafnarfjordhur|Husavik|Isafjordhur|Keflavik|Kjosarsysla|Kopavogur|Myrasysla|Neskaupstadhur|Nordhur-Isafjardharsysla|Nordhur-Mulasys-la|Nordhur-Thingeyjarsysla|Olafsfjordhur|Rangarvallasysla|Reykjavik|Saudharkrokur|Seydhisfjordhur|Siglufjordhur|Skagafjardharsysla|Snaefellsnes-og Hnappadalssysla|Strandasysla|Sudhur-Mulasysla|Sudhur-Thingeyjarsysla|Vesttmannaeyjar|Vestur-Bardhastrandarsysla|Vestur-Hunavatnssysla|Vestur-Isafjardharsysla|Vestur-Skaftafellssysla";
 aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assam|Bihar|Chandigarh|Chhattisgarh|Dadra and Nagar Haveli|Daman and Diu|Delhi|Goa|Gujarat|Haryana|Himachal Pradesh|Jammu and Kashmir|Jharkhand|Karnataka|Kerala|Lakshadweep|Madhya Pradesh|Maharashtra|Manipur|Meghalaya|Mizoram|Nagaland|Orissa|Pondicherry|Punjab|Rajasthan|Sikkim|Tamil Nadu|Tripura|Uttar Pradesh|Uttaranchal|West Bengal";
 aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
@@ -145,12 +145,12 @@ aStates[119]="|'Amman|Ajlun|Al 'Aqabah|Al Balqa'|Al Karak|Al Mafraq|At Tafilah|A
 aStates[120]="|Juan de Nova Island";
 aStates[121]="|Almaty|Aqmola|Aqtobe|Astana|Atyrau|Batys Qazaqstan|Bayqongyr|Mangghystau|Ongtustik Qazaqstan|Pavlodar|Qaraghandy|Qostanay|Qyzylorda|Shyghys Qazaqstan|Soltustik Qazaqstan|Zhambyl";
 aStates[122]="|Central|Coast|Eastern|Nairobi Area|North Eastern|Nyanza|Rift Valley|Western";
-aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba|Banaba|Beru|Butaritari|Central Gilberts|Gilbert Islands|Kanton|Kiritimati|Kuria|Line Islands|Line Islands|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts|Onotoa|Phoenix Islands|Southern Gilberts|Tabiteuea|Tabuaeran|Tamana|Tarawa|Tarawa|Teraina";
+aStates[123]="|Abaiang|Abemama|Aranuka|Arorae|Banaba (District)|Banaba|Beru|Butaritari|Central Gilberts (District)|Gilbert Islands (Unit)|Kanton|Kiritimati|Kuria|Line Islands (District)|Line Islands (Unit)|Maiana|Makin|Marakei|Nikunau|Nonouti|Northern Gilberts (District)|Onotoa|Phoenix Islands (Unit)|Southern Gilberts (District)|Tabiteuea|Tabuaeran|Tamana|Tarawa (District)|Tarawa|Teraina";
 aStates[124]="|Chagang-do (Chagang Province)|Hamgyong-bukto (North Hamgyong Province)|Hamgyong-namdo (South Hamgyong Province)|Hwanghae-bukto (North Hwanghae Province)|Hwanghae-namdo (South Hwanghae Province)|Kaesong-si (Kaesong City)|Kangwon-do (Kangwon Province)|Namp'o-si (Namp'o City)|P'yongan-bukto (North P'yongan Province)|P'yongan-namdo (South P'yongan Province)|P'yongyang-si (P'yongyang City)|Yanggang-do (Yanggang Province)"
 aStates[125]="|Ch'ungch'ong-bukto|Ch'ungch'ong-namdo|Cheju-do|Cholla-bukto|Cholla-namdo|Inch'on-gwangyoksi|Kangwon-do|Kwangju-gwangyoksi|Kyonggi-do|Kyongsang-bukto|Kyongsang-namdo|Pusan-gwangyoksi|Soul-t'ukpyolsi|Taegu-gwangyoksi|Taejon-gwangyoksi|Ulsan-gwangyoksi";
 aStates[126]="|Al 'Asimah|Al Ahmadi|Al Farwaniyah|Al Jahra'|Hawalli";
 aStates[127]="|Batken Oblasty|Bishkek Shaary|Chuy Oblasty (Bishkek)|Jalal-Abad Oblasty|Naryn Oblasty|Osh Oblasty|Talas Oblasty|Ysyk-Kol Oblasty (Karakol)"
-aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
+aStates[128]="|Attapu|Bokeo|Bolikhamxai|Champasak|Houaphan|Khammouan|Louangnamtha|Louangphabang|Oudomxai|Phongsali|Salavan|Savannakhet|Viangchan City|Viangchan|Xaignabouli|Xaisomboun|Xekong|Xiangkhoang";
 aStates[129]="|Aizkraukles Rajons|Aluksnes Rajons|Balvu Rajons|Bauskas Rajons|Cesu Rajons|Daugavpils|Daugavpils Rajons|Dobeles Rajons|Gulbenes Rajons|Jekabpils Rajons|Jelgava|Jelgavas Rajons|Jurmala|Kraslavas Rajons|Kuldigas Rajons|Leipaja|Liepajas Rajons|Limbazu Rajons|Ludzas Rajons|Madonas Rajons|Ogres Rajons|Preilu Rajons|Rezekne|Rezeknes Rajons|Riga|Rigas Rajons|Saldus Rajons|Talsu Rajons|Tukuma Rajons|Valkas Rajons|Valmieras Rajons|Ventspils|Ventspils Rajons";
 aStates[130]="|Beyrouth|Ech Chimal|Ej Jnoub|El Bekaa|Jabal Loubnane";
 aStates[131]="|Berea|Butha-Buthe|Leribe|Mafeteng|Maseru|Mohales Hoek|Mokhotlong|Qacha's Nek|Quthing|Thaba-Tseka";
@@ -176,7 +176,7 @@ aStates[150]="|Mayotte";
 aStates[151]="|Aguascalientes|Baja California|Baja California Sur|Campeche|Chiapas|Chihuahua|Coahuila de Zaragoza|Colima|Distrito Federal|Durango|Guanajuato|Guerrero|Hidalgo|Jalisco|Mexico|Michoacan de Ocampo|Morelos|Nayarit|Nuevo Leon|Oaxaca|Puebla|Queretaro de Arteaga|Quintana Roo|San Luis Potosi|Sinaloa|Sonora|Tabasco|Tamaulipas|Tlaxcala|Veracruz-Llave|Yucatan|Zacatecas";
 aStates[152]="|Chuuk (Truk)|Kosrae|Pohnpei|Yap";
 aStates[153]="|Midway Islands";
-aStates[154]="|Balti|Cahul|Chisinau|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
+aStates[154]="|Balti|Cahul|Chisinau (City)|Chisinau|Dubasari|Edinet|Gagauzia|Lapusna|Orhei|Soroca|Tighina|Ungheni";
 aStates[155]="|Fontvieille|La Condamine|Monaco-Ville|Monte-Carlo";
 aStates[156]="|Arhangay|Bayan-Olgiy|Bayanhongor|Bulgan|Darhan|Dornod|Dornogovi|Dundgovi|Dzavhan|Erdenet|Govi-Altay|Hentiy|Hovd|Hovsgol|Omnogovi|Ovorhangay|Selenge|Suhbaatar|Tov|Ulaanbaatar|Uvs";
 aStates[157]="|Saint Anthony|Saint Georges|Saint Peter's";
@@ -243,7 +243,7 @@ aStates[217]="|Hhohho|Lubombo|Manzini|Shiselweni";
 aStates[218]="|Blekinge|Dalarnas|Gavleborgs|Gotlands|Hallands|Jamtlands|Jonkopings|Kalmar|Kronobergs|Norrbottens|Orebro|Ostergotlands|Skane|Sodermanlands|Stockholms|Uppsala|Varmlands|Vasterbottens|Vasternorrlands|Vastmanlands|Vastra Gotalands";
 aStates[219]="|Aargau|Ausser-Rhoden|Basel-Landschaft|Basel-Stadt|Bern|Fribourg|Geneve|Glarus|Graubunden|Inner-Rhoden|Jura|Luzern|Neuchatel|Nidwalden|Obwalden|Sankt Gallen|Schaffhausen|Schwyz|Solothurn|Thurgau|Ticino|Uri|Valais|Vaud|Zug|Zurich";
 aStates[220]="|Al Hasakah|Al Ladhiqiyah|Al Qunaytirah|Ar Raqqah|As Suwayda'|Dar'a|Dayr az Zawr|Dimashq|Halab|Hamah|Hims|Idlib|Rif Dimashq|Tartus";
-aStates[221]="|Chang-hua|Chi-lung|Chia-i|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu|Hsin-chu|Hua-lien|I-lan|Kao-hsiung|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung|T'ai-chung|T'ai-nan|T'ai-nan|T'ai-pei|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
+aStates[221]="|Chang-hua|Chi-lung|Chia-i (City)|Chia-i|Chung-hsing-hsin-ts'un|Hsin-chu (City)|Hsin-chu|Hua-lien|I-lan|Kao-hsiung (City)|Kao-hsiung|Miao-li|Nan-t'ou|P'eng-hu|P'ing-tung|T'ai-chung (City)|T'ai-chung|T'ai-nan (City)|T'ai-nan|T'ai-pei (City)|T'ai-pei|T'ai-tung|T'ao-yuan|Yun-lin";
 aStates[222]="|Viloyati Khatlon|Viloyati Leninobod|Viloyati Mukhtori Kuhistoni Badakhshon";
 aStates[223]="|Arusha|Dar es Salaam|Dodoma|Iringa|Kagera|Kigoma|Kilimanjaro|Lindi|Mara|Mbeya|Morogoro|Mtwara|Mwanza|Pemba North|Pemba South|Pwani|Rukwa|Ruvuma|Shinyanga|Singida|Tabora|Tanga|Zanzibar Central/South|Zanzibar North|Zanzibar Urban/West";
 aStates[224]="|Amnat Charoen|Ang Thong|Buriram|Chachoengsao|Chai Nat|Chaiyaphum|Chanthaburi|Chiang Mai|Chiang Rai|Chon Buri|Chumphon|Kalasin|Kamphaeng Phet|Kanchanaburi|Khon Kaen|Krabi|Krung Thep Mahanakhon (Bangkok)|Lampang|Lamphun|Loei|Lop Buri|Mae Hong Son|Maha Sarakham|Mukdahan|Nakhon Nayok|Nakhon Pathom|Nakhon Phanom|Nakhon Ratchasima|Nakhon Sawan|Nakhon Si Thammarat|Nan|Narathiwat|Nong Bua Lamphu|Nong Khai|Nonthaburi|Pathum Thani|Pattani|Phangnga|Phatthalung|Phayao|Phetchabun|Phetchaburi|Phichit|Phitsanulok|Phra Nakhon Si Ayutthaya|Phrae|Phuket|Prachin Buri|Prachuap Khiri Khan|Ranong|Ratchaburi|Rayong|Roi Et|Sa Kaeo|Sakon Nakhon|Samut Prakan|Samut Sakhon|Samut Songkhram|Sara Buri|Satun|Sing Buri|Sisaket|Songkhla|Sukhothai|Suphan Buri|Surat Thani|Surin|Tak|Trang|Trat|Ubon Ratchathani|Udon Thani|Uthai Thani|Uttaradit|Yala|Yasothon";

js/main.js

@@ -92,7 +92,6 @@
 		/* event from comment textarea button popups */
 		/* insert returned bbcode at cursor position or replace selected text */
 		$("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
-			console.log("on", id);
 			$.colorbox.close();
 			var textarea = document.getElementById("comment-edit-text-" +id);
 			var start = textarea.selectionStart;
@@ -117,7 +116,6 @@
 			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 			input.val(val);
-			//console.log(id);
 		});
 
 		/* setup field_richtext */
@@ -179,110 +177,77 @@
 		$('#nav-notifications-menu, aside').perfectScrollbar();
 
 		/* nav update event  */
-		$('nav').bind('nav-update', function(e,data){
-			var invalid = $(data).find('invalid').text();
+		$('nav').bind('nav-update', function(e, data){
+			var invalid = data.invalid || 0;
 			if(invalid == 1) { window.location.href=window.location.href }
 
-			var net = $(data).find('net').text();
-			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
-			$('#net-update').html(net);
+			['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
+				var number = data[type];
+				if (number == 0) {
+					number = '';
+					$('#' + type + '-update').removeClass('show');
+				} else {
+					$('#' + type + '-update').addClass('show');
+				}
+				$('#' + type + '-update').text(number);
+			});
 
-			var home = $(data).find('home').text();
-			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-			$('#home-update').html(home);
-
-			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
-			$('#intro-update').html(intro);
-
-			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
-			$('#mail-update').html(mail);
-
-			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			var intro = data['intro'];
+			if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
 			$('#intro-update-li').html(intro);
 
-			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			var mail = data['mail'];
+			if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
 			$('#mail-update-li').html(mail);
 
-
-			var allevents = $(data).find('all-events').text();
-			if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') }
-			$('#allevents-update').html(allevents);
-
-			var alleventstoday = $(data).find('all-events-today').text();
-			if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') }
-
-			var events = $(data).find('events').text();
-			if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
-			$('#events-update').html(events);
-
-			var eventstoday = $(data).find('events-today').text();
-			if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') }
-
-			var birthdays = $(data).find('birthdays').text();
-			if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
-			$('#birthdays-update').html(birthdays);
-
-			var birthdaystoday = $(data).find('birthdays-today').text();
-			if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
-
 			$(".sidebar-group-li .notify").removeClass("show");
-			$(data).find("group").each(function() {
-				var gid = this.id;
-				var gcount = this.innerHTML;
+			$(data.groups).each(function(key, group) {
+				var gid = group.id;
+				var gcount = group.count;
 				$(".group-"+gid+" .notify").addClass("show").text(gcount);
 			});
 
 			$(".forum-widget-entry .notify").removeClass("show");
-			$(data).find("forum").each(function() {
-				var fid = this.id;
-				var fcount = this.innerHTML;
+			$(data.forums).each(function(key, forum) {
+				var fid = forum.id;
+				var fcount = forum.count;
 				$(".forum-"+fid+" .notify").addClass("show").text(fcount);
 			});
 
-
-			var eNotif = $(data).find('notif')
-
-			if (eNotif.children("note").length==0){
+			if (data.notifications.length == 0) {
 				$("#nav-notifications-menu").html(notifications_empty);
 			} else {
-				nnm = $("#nav-notifications-menu");
+				var nnm = $("#nav-notifications-menu");
 				nnm.html(notifications_all + notifications_mark);
-				//nnm.attr('popup','true');
 
 				var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem"));
 				var notification_id = 0;
-				eNotif.children("note").each(function(){
-					e = $(this);
-					var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
-					var contact = ("<a href="+e.attr('url')+"><span class='contactname'>"+e.attr('name')+"</span></a>");
-					var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
+				$(data.notifications).each(function(key, notif){
+					var text = notif.message.format('<span class="contactname">' + notif.name + '</span>');
+					var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>');
+					var seenclass = (notif.seen == 1) ? "notify-seen" : "notify-unseen";
 					var html = notifications_tpl.format(
-						e.attr('href'),                     // {0}  // link to the source
-						e.attr('photo'),                    // {1}  // photo of the contact
-						text,                               // {2}  // preformatted text (autor + text)
-						e.attr('date'),                     // {3}  // date of notification (time ago)
-						seenclass,                          // {4}  // visited status of the notification
-						new Date(e.attr('timestamp')*1000), // {5}  // date of notification
-						e.attr('url'),                      // {6}  // profile url of the contact
-						e.text().format(contact),           // {7}  // preformatted html (text including author profile url)
-						''                                  // {8}  // Deprecated
+						notif.href,                     // {0}  // link to the source
+						notif.photo,                    // {1}  // photo of the contact
+						text,                       // {2}  // preformatted text (autor + text)
+						notif.date,                     // {3}  // date of notification (time ago)
+						seenclass,                  // {4}  // visited status of the notification
+						new Date(notif.timestamp*1000), // {5}  // date of notification
+						notif.url,                      // {6}  // profile url of the contact
+						notif.message.format(contact),  // {7}  // preformatted html (text including author profile url)
+						''                          // {8}  // Deprecated
 					);
 					nnm.append(html);
 				});
-				$(eNotif.children("note").get().reverse()).each(function(){
-					e = $(this);
-					notification_id = parseInt(e.attr('timestamp'));
-					if (notification_lastitem!== null && notification_id > notification_lastitem) {
-						if (getNotificationPermission()==="granted") {
+				$(data.notifications.reverse()).each(function(key, e){
+					notification_id = parseInt(e.timestamp);
+					if (notification_lastitem !== null && notification_id > notification_lastitem) {
+						if (getNotificationPermission() === "granted") {
 							var notification = new Notification(document.title, {
-											  body: decodeHtml(e.text().replace('&rarr; ','').format(e.attr('name'))),
-											  icon: e.attr('photo'),
+											  body: decodeHtml(e.message.replace('&rarr; ', '').format(e.name)),
+											  icon: e.photo,
 											 });
-							notification['url'] = e.attr('href');
+							notification['url'] = e.href;
 							notification.addEventListener("click", function(ev){
 								window.location = ev.target.url;
 							});
@@ -303,23 +268,18 @@
 				});
 			}
 
-			notif = eNotif.attr('count');
-			if (notif>0){
+			var notif = data['notify'];
+			if (notif > 0){
 				$("#nav-notifications-linkmenu").addClass("on");
 			} else {
 				$("#nav-notifications-linkmenu").removeClass("on");
 			}
-			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-			$('#notify-update').html(notif);
 
-			var eSysmsg = $(data).find('sysmsgs');
-			eSysmsg.children("notice").each(function(){
-				text = $(this).text();
-				$.jGrowl(text, { sticky: true, theme: 'notice' });
+			$(data.sysmsgs.notice).each(function(key, message){
+				$.jGrowl(message, {sticky: true, theme: 'notice'});
 			});
-			eSysmsg.children("info").each(function(){
-				text = $(this).text();
-				$.jGrowl(text, { sticky: false, theme: 'info', life: 5000 });
+			$(data.sysmsgs.info).each(function(key, message){
+				$.jGrowl(message, {sticky: false, theme: 'info', life: 5000});
 			});
 
 			/* update the js scrollbars */
@@ -374,50 +334,38 @@
 
 	function NavUpdate() {
 
-		if(! stopped) {
-			var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
-			$.get(pingCmd,function(data) {
-				$(data).find('result').each(function() {
+		if (!stopped) {
+			var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');
+			$.get(pingCmd, function(data) {
+				if (data.result) {
 					// send nav-update event
-					$('nav').trigger('nav-update', this);
-
+					$('nav').trigger('nav-update', data.result);
 
 					// start live update
-
-					if($('#live-network').length)   { src = 'network'; liveUpdate(); }
-					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
-					if($('#live-community').length) { src = 'community'; liveUpdate(); }
-					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($('#live-display').length)     { src = 'display'; liveUpdate(); }
-/*					if($('#live-display').length) {
-						if(liking) {
-							liking = 0;
-							window.location.href=window.location.href
+					['network', 'profile', 'community', 'notes', 'display'].forEach(function (src) {
+						if ($('#live-' + src).length) {
+							liveUpdate(src);
 						}
-					}*/
-					if($('#live-photos').length) {
-						if(liking) {
+					});
+					if ($('#live-photos').length) {
+						if (liking) {
 							liking = 0;
-							window.location.href=window.location.href
+							window.location.href = window.location.href;
 						}
 					}
-
-
-
-
-				});
+				}
 			}) ;
 		}
-		timer = setTimeout(NavUpdate,updateInterval);
+		timer = setTimeout(NavUpdate, updateInterval);
 	}
 
-	function liveUpdate() {
+	function liveUpdate(src) {
 		if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
 		if(($('.comment-edit-text-full').length) || (in_progress)) {
 			if(livetime) {
 				clearTimeout(livetime);
 			}
-			livetime = setTimeout(liveUpdate, 5000);
+			livetime = setTimeout(function() {liveUpdate(src)}, 5000);
 			return;
 		}
 		if(livetime != null)
@@ -740,8 +688,6 @@
 		// page number
 		infinite_scroll.pageno+=1;
 
-		console.log('Loading page ' + infinite_scroll.pageno);
-
 		// get the raw content from the next page and insert this content
 		// right before "#conversation-end"
 		$.get('network?mode=raw' + infinite_scroll.reload_uri + '&page=' + infinite_scroll.pageno, function(data) {

mod/admin.php

@@ -428,6 +428,21 @@ function admin_page_queue(&$a) {
  * @return string
  */
 function admin_page_summary(&$a) {
+	global $db;
+	// are there MyISAM tables in the DB? If so, trigger a warning message
+	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
+		dbesc($db->database_name()));
+	$showwarning = false;
+	$warningtext = array();
+	if (dbm::is_result($r)) {
+		$showwarning = true;
+		$warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the <tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your Friendica installation.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
+	}
+	// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
+	if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+		!(strpos($db->server_info(), 'MariaDB') !== false)) {
+		$warningtext[] = t('You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB.');
+	}
 	$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
 	$accounts = array(
 		array(t('Normal Account'), 0),
@@ -478,7 +493,9 @@ function admin_page_summary(&$a) {
 		'$platform' => FRIENDICA_PLATFORM,
 		'$codename' => FRIENDICA_CODENAME,
 		'$build' =>  get_config('system','build'),
-		'$plugins' => array(t('Active plugins'), $a->plugins)
+		'$plugins' => array(t('Active plugins'), $a->plugins),
+		'$showwarning' => $showwarning,
+		'$warningtext' => $warningtext
 	));
 }
 
@@ -1388,6 +1405,7 @@ function admin_page_users(&$a){
 		'$h_deleted' => t('User waiting for permanent deletion'),
 		'$th_pending' => array(t('Request date'), t('Name'), t('Email')),
 		'$no_pending' =>  t('No registrations.'),
+		'$pendingnotetext' => t('Note from the user'),
 		'$approve' => t('Approve'),
 		'$deny' => t('Deny'),
 		'$delete' => t('Delete'),

mod/dfrn_confirm.php

@@ -1,17 +1,21 @@
 <?php
 
-/*
- * Module: dfrn_confirm
+/**
+ * @file mod/dfrn_confirm.php
+ * @brief Module: dfrn_confirm
  * Purpose: Friendship acceptance for DFRN contacts
- *
+ *.
  * There are two possible entry points and three scenarios.
- *
+ *.
  *   1. A form was submitted by our user approving a friendship that originated elsewhere.
  *      This may also be called from dfrn_request to automatically approve a friendship.
  *
  *   2. We may be the target or other side of the conversation to scenario 1, and will
  *      interact with that process on our own user's behalf.
- *
+ *.
+ *  @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *    You also find a graphic which describes the confirmation process at
+ *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
  */
 
 require_once('include/enotify.php');
@@ -22,7 +26,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 	if(is_array($handsfree)) {
 
-		/**
+		/*
 		 * We were called directly from dfrn_request due to automatic friend acceptance.
 		 * Any $_POST parameters we may require are supplied in the $handsfree array.
 		 *
@@ -37,7 +41,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$node = $a->argv[1];
 	}
 
-		/**
+		/*
 		 *
 		 * Main entry point. Scenario 1. Our user received a friend request notification (perhaps
 		 * from another site) and clicked 'Approve'.
@@ -87,7 +91,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$activity = ((x($_POST,'activity'))   ? intval($_POST['activity'])      : 0 );
 		}
 
-		/**
+		/*
 		 *
 		 * Ensure that dfrn_id has precedence when we go to find the contact record.
 		 * We only want to search based on contact id if there is no dfrn_id,
@@ -103,7 +107,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			logger('Confirming follower with contact_id: ' . $cid);
 
 
-		/**
+		/*
 		 *
 		 * The other person will have been issued an ID when they first requested friendship.
 		 * Locate their record. At this time, their record will have both pending and blocked set to 1.
@@ -139,7 +143,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		if($network === NETWORK_DFRN) {
 
-			/**
+			/*
 			 *
 			 * Generate a key pair for all further communications with this person.
 			 * We have a keypair for every contact, and a site key for unknown people.
@@ -166,7 +170,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 			$params = array();
 
-			/**
+			/*
 			 *
 			 * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
 			 * site private key (person on the other end can decrypt it with our site public key).
@@ -212,7 +216,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 			logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
 
-			/**
+			/*
 			 *
 			 * POST all this stuff to the other site.
 			 * Temporarily raise the network timeout to 120 seconds because the default 60
@@ -506,7 +510,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		//NOTREACHED
 	}
 
-	/**
+	/*
 	 *
 	 *
 	 * End of Scenario 1. [Local confirmation of remote friend request].

mod/dfrn_notify.php

@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file mod/dfrn_notify.php
+ * @brief The dfrn notify endpoint
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ */
 require_once('include/items.php');
 require_once('include/dfrn.php');
 require_once('include/event.php');
@@ -7,7 +12,7 @@ require_once('include/event.php');
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
 function dfrn_notify_post(&$a) {
-    logger(__function__, LOGGER_TRACE);
+	logger(__function__, LOGGER_TRACE);
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
 	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
@@ -117,7 +122,7 @@ function dfrn_notify_post(&$a) {
 
 	if($dissolve == 1) {
 
-		/**
+		/*
 		 * Relationship is dissolved permanently
 		 */
 

mod/dfrn_request.php

@@ -1,12 +1,15 @@
 <?php
 
 /**
- *
- * Module: dfrn_request
+ * @file mod/dfrn_request.php
+ * @brief Module: dfrn_request
  *
  * Purpose: Handles communication associated with the issuance of
  * friend requests.
  *
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *    You also find a graphic which describes the confirmation process at
+ *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
 
 require_once('include/enotify.php');
@@ -14,7 +17,6 @@ require_once('include/Scrape.php');
 require_once('include/Probe.php');
 require_once('include/group.php');
 
-if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
 	if($a->argc > 1)
@@ -22,7 +24,7 @@ function dfrn_request_init(&$a) {
 
 	profile_load($a,$which);
 	return;
-}}
+}
 
 
 /**
@@ -40,8 +42,6 @@ function dfrn_request_init(&$a) {
  * After logging in, we click 'submit' to approve the linkage.
  *
  */
-
-if(! function_exists('dfrn_request_post')) {
 function dfrn_request_post(&$a) {
 
 	if(($a->argc != 2) || (! count($a->profile))) {
@@ -55,7 +55,7 @@ function dfrn_request_post(&$a) {
 	}
 
 
-	/**
+	/*
 	 *
 	 * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
 	 * to confirm the request, and then we've clicked submit (perhaps after logging in).
@@ -65,7 +65,7 @@ function dfrn_request_post(&$a) {
 
 	if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
 
-		/**
+		/*
 		 * Ensure this is a valid request
 		 */
 
@@ -77,23 +77,24 @@ function dfrn_request_post(&$a) {
 			$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
 			$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
 			$contact_record = null;
+			$blocked = 1;
+			$pending = 1;
 
 			if(x($dfrn_url)) {
 
-				/**
+				/*
 				 * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
 				 */
 
-				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
+				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
 					intval(local_user()),
-					dbesc($dfrn_url),
 					dbesc(normalise_link($dfrn_url))
 				);
 
 				if(count($r)) {
 					if(strlen($r[0]['dfrn-id'])) {
 
-						/**
+						/*
 						 * We don't need to be here. It has already happened.
 						 */
 
@@ -113,7 +114,7 @@ function dfrn_request_post(&$a) {
 				}
 				else {
 
-					/**
+					/*
 					 * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
 					 */
 
@@ -141,19 +142,18 @@ function dfrn_request_post(&$a) {
 
 					$photo = $parms["photo"];
 
-					/********* Escape the entire array ********/
+					// Escape the entire array
 
 					dbesc_array($parms);
 
-					/******************************************/
 
-					/**
+					/*
 					 * Create a contact record on our site for the other person
 					 */
 
 					$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
-						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
-						VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
+						VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
 						intval(local_user()),
 						datetime_convert(),
 						dbesc($dfrn_url),
@@ -170,7 +170,9 @@ function dfrn_request_post(&$a) {
 						$parms['dfrn-poco'],
 						dbesc(NETWORK_DFRN),
 						intval($aes_allow),
-						intval($hidden)
+						intval($hidden),
+						intval($blocked),
+						intval($pending)
 					);
 				}
 
@@ -195,7 +197,7 @@ function dfrn_request_post(&$a) {
 				} else
 					$forwardurl = $a->get_baseurl()."/contacts";
 
-				/**
+				/*
 				 * Allow the blocked remote notification to complete
 				 */
 
@@ -222,7 +224,7 @@ function dfrn_request_post(&$a) {
 		return; // NOTREACHED
 	}
 
-	/**
+	/*
 	 * Otherwise:
 	 *
 	 * Scenario 1:
@@ -256,11 +258,13 @@ function dfrn_request_post(&$a) {
 	$contact_record = null;
 	$failed         = false;
 	$parms          = null;
+	$blocked = 1;
+	$pending = 1;
 
 
 	if( x($_POST,'dfrn_url')) {
 
-		/**
+		/*
 		 * Block friend request spam
 		 */
 
@@ -277,7 +281,7 @@ function dfrn_request_post(&$a) {
 			}
 		}
 
-		/**
+		/*
 		 *
 		 * Cleanup old introductions that remain blocked.
 		 * Also remove the contact record, but only if there is no existing relationship
@@ -304,7 +308,7 @@ function dfrn_request_post(&$a) {
 			}
 		}
 
-		/**
+		/*
 		 *
 		 * Cleanup any old email intros - which will have a greater lifetime
 		 */
@@ -354,8 +358,6 @@ function dfrn_request_post(&$a) {
 			$nurl    = normalise_url($host);
 			$poll    = 'email ' . random_string();
 			$notify  = 'smtp ' . random_string();
-			$blocked = 1;
-			$pending = 1;
 			$network = NETWORK_MAIL2;
 			$rel     = CONTACT_IS_FOLLOWER;
 
@@ -540,8 +542,8 @@ function dfrn_request_post(&$a) {
 
 				dbesc_array($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
-					`request`, `confirm`, `notify`, `poll`, `poco`, `network` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+					`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
 					intval($uid),
 					dbesc(datetime_convert()),
 					$parms['url'],
@@ -557,7 +559,9 @@ function dfrn_request_post(&$a) {
 					$parms['dfrn-notify'],
 					$parms['dfrn-poll'],
 					$parms['dfrn-poco'],
-					dbesc(NETWORK_DFRN)
+					dbesc(NETWORK_DFRN),
+					intval($blocked),
+					intval($pending)
 				);
 
 				// find the contact record we just created
@@ -613,7 +617,7 @@ function dfrn_request_post(&$a) {
 			// END $network === NETWORK_DFRN
 		} elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
 
-			/**
+			/*
 			 *
 			 * Substitute our user's feed URL into $url template
 			 * Send the subscriber home to subscribe
@@ -642,12 +646,9 @@ function dfrn_request_post(&$a) {
 		}
 
 	}	return;
-}}
+}
 
 
-
-
-if(! function_exists('dfrn_request_content')) {
 function dfrn_request_content(&$a) {
 
 	if(($a->argc != 2) || (! count($a->profile)))
@@ -781,7 +782,7 @@ function dfrn_request_content(&$a) {
 	}
 	else {
 
-		/**
+		/*
 		 * Normal web request. Display our user's introduction form.
 		 */
 
@@ -793,7 +794,7 @@ function dfrn_request_content(&$a) {
 		}
 
 
-		/**
+		/*
 		 * Try to auto-fill the profile address
 		 */
 
@@ -816,7 +817,7 @@ function dfrn_request_content(&$a) {
 		$target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 
 
-		/**
+		/*
 		 *
 		 * The auto_request form only has the profile address
 		 * because nobody is going to read the comments and
@@ -881,4 +882,4 @@ function dfrn_request_content(&$a) {
 	}
 
 	return; // Somebody is fishing.
-}}
+}

mod/item.php

@@ -744,6 +744,9 @@ function item_post(&$a) {
 
 	if($preview) {
 		require_once('include/conversation.php');
+		// We set the datarray ID to -1 because in preview mode the dataray
+		// doesn't have an ID.
+		$datarray["id"] = -1;
 		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true);
 		logger('preview: ' . $o);
 		echo json_encode(array('preview' => $o));

mod/network.php

@@ -395,10 +395,10 @@ function network_content(&$a, $update = 0) {
 
 		if($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
-				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
-									'Warning: This group contains %s members from an insecure network.',
-									$t), $t ) . EOL);
-				notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+				notice(sprintf(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
+						"Warning: This group contains %s members from a network that doesn't allow non public messages.",
+						$t), $t).EOL);
+				notice(t("Messages in this group won't be send to these receivers.").EOL);
 			}
 		}
 
@@ -453,6 +453,7 @@ function network_content(&$a, $update = 0) {
 	if ($nouveau OR strlen($file) OR $update) {
 		$sql_table = "`item`";
 		$sql_parent = "`parent`";
+		$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
 	}
 
 	$sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
@@ -487,9 +488,9 @@ function network_content(&$a, $update = 0) {
 				$gcontact_str_self = $self[0]["gid"];
 			}
 
-			$sql_post_table = " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
-			$sql_extra3 .= " AND ($sql_table.`contact-id` IN ($contact_str) ";
-			$sql_extra3 .= " OR ($sql_table.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
+			$sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent;
+			$sql_extra3 .= " AND (`thread`.`contact-id` IN ($contact_str) ";
+			$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))";
 		} else {
 			$sql_extra3 .= " AND false ";
 			info( t('Group is empty'));
@@ -503,7 +504,7 @@ function network_content(&$a, $update = 0) {
 	elseif($cid) {
 
 		$r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
-				AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+				AND (NOT `blocked` OR `pending`) LIMIT 1",
 			intval($cid)
 		);
 		if(count($r)) {
@@ -569,7 +570,7 @@ function network_content(&$a, $update = 0) {
 		if($tag) {
 			$sql_extra = "";
 
-			$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+			$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
 					dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
 			$sql_order = "`item`.`id`";
 			$order_mode = "id";
@@ -583,7 +584,7 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 	if(strlen($file)) {
-		$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+		$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
 				dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
 		$sql_order = "`item`.`id`";
 		$order_mode = "id";
@@ -602,7 +603,7 @@ function network_content(&$a, $update = 0) {
 		if(get_config('system', 'old_pager')) {
 			$r = qu("SELECT COUNT(*) AS `total`
 				FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
 				$sql_extra2 $sql_extra3
 				$sql_extra $sql_nets ",
@@ -680,7 +681,7 @@ function network_content(&$a, $update = 0) {
 
 			$r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
 				FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
 				AND NOT `item`.`moderated` AND `item`.`unseen`
 				$sql_extra3 $sql_extra $sql_nets
@@ -690,7 +691,7 @@ function network_content(&$a, $update = 0) {
 		} else {
 			$r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
 				FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-				AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
 				AND NOT `thread`.`moderated`
 				$sql_extra2 $sql_extra3 $sql_extra $sql_nets

mod/parse_url.php

@@ -1,516 +1,176 @@
 <?php
+
 /** 
  * @file mod/parse_url.php
+ * @brief The parse_url module
  * 
- * @todo https://developers.google.com/+/plugins/snippet/
+ * This module does parse an url for embedable content (audio, video, image files or link)
+ * information and does format this information to BBCode or html (this depends
+ * on the user settings - default is BBCode output).
+ * If the user has enabled the richtext editor setting the output will be in html
+ * (Note: This is not always possible and in some case not useful because
+ * the richtext editor doesn't support all kind of html).
+ * Otherwise the output will be constructed BBCode.
  * 
- * @verbatim
- * <meta itemprop="name" content="Toller Titel">
- * <meta itemprop="description" content="Eine tolle Beschreibung">
- * <meta itemprop="image" content="http://maple.libertreeproject.org/images/tree-icon.png">
- * 
- * <body itemscope itemtype="http://schema.org/Product">
- *   <h1 itemprop="name">Shiny Trinket</h1>
- *   <img itemprop="image" src="{image-url}" />
- *   <p itemprop="description">Shiny trinkets are shiny.</p>
- * </body>
- * @endverbatim
+ * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content 
 */
 
-if(!function_exists('deletenode')) {
-	function deletenode(&$doc, $node)
-	{
-		$xpath = new DomXPath($doc);
-		$list = $xpath->query("//".$node);
-		foreach ($list as $child)
-			$child->parentNode->removeChild($child);
-	}
-}
+use \Friendica\ParseUrl;
 
-function completeurl($url, $scheme) {
-	$urlarr = parse_url($url);
-
-	if (isset($urlarr["scheme"]))
-		return($url);
-
-	$schemearr = parse_url($scheme);
-
-	$complete = $schemearr["scheme"]."://".$schemearr["host"];
-
-	if (@$schemearr["port"] != "")
-		$complete .= ":".$schemearr["port"];
-
-		if(strpos($urlarr['path'],'/') !== 0)
-			$complete .= '/';
-
-	$complete .= $urlarr["path"];
-
-	if (@$urlarr["query"] != "")
-		$complete .= "?".$urlarr["query"];
-
-	if (@$urlarr["fragment"] != "")
-		$complete .= "#".$urlarr["fragment"];
-
-	return($complete);
-}
-
-function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
-
-	if ($url == "")
-		return false;
-
-	$r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
-		dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
-
-	if ($r)
-		$data = $r[0]["content"];
-
-	if (!is_null($data)) {
-		$data = unserialize($data);
-		return $data;
-	}
-
-	$data = parseurl_getsiteinfo($url, $no_guessing, $do_oembed);
-
-	q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')
-		 ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
-		dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed),
-		dbesc(serialize($data)), dbesc(datetime_convert()),
-		dbesc(serialize($data)), dbesc(datetime_convert()));
-
-	return $data;
-}
-
-function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
-	require_once("include/network.php");
-	require_once("include/Photo.php");
-
-	$a = get_app();
-
-	$siteinfo = array();
-
-	// Check if the URL does contain a scheme
-	$scheme = parse_url($url, PHP_URL_SCHEME);
-
-	if ($scheme == "") {
-		$url = "http://".trim($url, "/");
-	}
-
-	if ($count > 10) {
-		logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG);
-		return($siteinfo);
-	}
-
-	$url = trim($url, "'");
-	$url = trim($url, '"');
-
-	$url = original_url($url);
-
-	$siteinfo["url"] = $url;
-	$siteinfo["type"] = "link";
-
-	$check_cert = get_config('system','verifyssl');
-
-	$stamp1 = microtime(true);
-
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_HEADER, 1);
-	curl_setopt($ch, CURLOPT_NOBODY, 1);
-	curl_setopt($ch, CURLOPT_TIMEOUT, 3);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
-
-	$header = curl_exec($ch);
-	$curl_info = @curl_getinfo($ch);
-	$http_code = $curl_info['http_code'];
-	curl_close($ch);
-
-	$a->save_timestamp($stamp1, "network");
-
-	if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302") OR ($curl_info['http_code'] == "303") OR ($curl_info['http_code'] == "307"))
-		AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
-		if ($curl_info['redirect_url'] != "")
-			$siteinfo = parseurl_getsiteinfo($curl_info['redirect_url'], $no_guessing, $do_oembed, ++$count);
-		else
-			$siteinfo = parseurl_getsiteinfo($curl_info['location'], $no_guessing, $do_oembed, ++$count);
-		return($siteinfo);
-	}
-
-	// if the file is too large then exit
-	if ($curl_info["download_content_length"] > 1000000)
-		return($siteinfo);
-
-	// if it isn't a HTML file then exit
-	if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
-		return($siteinfo);
-
-	if ($do_oembed) {
-		require_once("include/oembed.php");
-
-		$oembed_data = oembed_fetch_url($url);
-
-		if (!in_array($oembed_data->type, array("error", "rich"))) {
-			$siteinfo["type"] = $oembed_data->type;
-		}
-
-		if (($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) {
-			if (isset($oembed_data->title))
-				$siteinfo["title"] = $oembed_data->title;
-			if (isset($oembed_data->description))
-				$siteinfo["text"] = trim($oembed_data->description);
-			if (isset($oembed_data->thumbnail_url))
-				$siteinfo["image"] = $oembed_data->thumbnail_url;
-		}
-	}
-
-	$stamp1 = microtime(true);
-
-	// Now fetch the body as well
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_HEADER, 1);
-	curl_setopt($ch, CURLOPT_NOBODY, 0);
-	curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
-
-	$header = curl_exec($ch);
-	$curl_info = @curl_getinfo($ch);
-	$http_code = $curl_info['http_code'];
-	curl_close($ch);
-
-	$a->save_timestamp($stamp1, "network");
-
-	// Fetch the first mentioned charset. Can be in body or header
-	$charset = "";
-	if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
-		$charset = trim(trim(trim(array_pop($matches)), ';,'));
-
-	if ($charset == "")
-		$charset = "utf-8";
-
-	$pos = strpos($header, "\r\n\r\n");
-
-	if ($pos)
-		$body = trim(substr($header, $pos));
-	else
-		$body = $header;
-
-	if (($charset != '') AND (strtoupper($charset) != "UTF-8")) {
-		logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG);
-		//$body = mb_convert_encoding($body, "UTF-8", $charset);
-		$body = iconv($charset, "UTF-8//TRANSLIT", $body);
-	}
-
-	$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
-
-	$doc = new DOMDocument();
-	@$doc->loadHTML($body);
-
-	deletenode($doc, 'style');
-	deletenode($doc, 'script');
-	deletenode($doc, 'option');
-	deletenode($doc, 'h1');
-	deletenode($doc, 'h2');
-	deletenode($doc, 'h3');
-	deletenode($doc, 'h4');
-	deletenode($doc, 'h5');
-	deletenode($doc, 'h6');
-	deletenode($doc, 'ol');
-	deletenode($doc, 'ul');
-
-	$xpath = new DomXPath($doc);
-
-	$list = $xpath->query("//meta[@content]");
-	foreach ($list as $node) {
-		$attr = array();
-		if ($node->attributes->length)
-			foreach ($node->attributes as $attribute)
-				$attr[$attribute->name] = $attribute->value;
-
-		if (@$attr["http-equiv"] == 'refresh') {
-			$path = $attr["content"];
-			$pathinfo = explode(";", $path);
-			$content = "";
-			foreach ($pathinfo AS $value) {
-				if (substr(strtolower($value), 0, 4) == "url=")
-					$content = substr($value, 4);
-			}
-			if ($content != "") {
-				$siteinfo = parseurl_getsiteinfo($content, $no_guessing, $do_oembed, ++$count);
-				return($siteinfo);
-			}
-		}
-	}
-
-	$list = $xpath->query("//title");
-	if ($list->length > 0)
-		$siteinfo["title"] = $list->item(0)->nodeValue;
-
-	//$list = $xpath->query("head/meta[@name]");
-	$list = $xpath->query("//meta[@name]");
-	foreach ($list as $node) {
-		$attr = array();
-		if ($node->attributes->length)
-			foreach ($node->attributes as $attribute)
-				$attr[$attribute->name] = $attribute->value;
-
-		$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
-
-		if ($attr["content"] != "")
-			switch (strtolower($attr["name"])) {
-				case "fulltitle":
-					$siteinfo["title"] = $attr["content"];
-					break;
-				case "description":
-					$siteinfo["text"] = $attr["content"];
-					break;
-				case "thumbnail":
-					$siteinfo["image"] = $attr["content"];
-					break;
-				case "twitter:image":
-					$siteinfo["image"] = $attr["content"];
-					break;
-				case "twitter:image:src":
-					$siteinfo["image"] = $attr["content"];
-					break;
-				case "twitter:card":
-					if (($siteinfo["type"] == "") OR ($attr["content"] == "photo"))
-						$siteinfo["type"] = $attr["content"];
-					break;
-				case "twitter:description":
-					$siteinfo["text"] = $attr["content"];
-					break;
-				case "twitter:title":
-					$siteinfo["title"] = $attr["content"];
-					break;
-				case "dc.title":
-					$siteinfo["title"] = $attr["content"];
-					break;
-				case "dc.description":
-					$siteinfo["text"] = $attr["content"];
-					break;
-				case "keywords":
-					$keywords = explode(",", $attr["content"]);
-					break;
-				case "news_keywords":
-					$keywords = explode(",", $attr["content"]);
-					break;
-			}
-		if ($siteinfo["type"] == "summary")
-			$siteinfo["type"] = "link";
-	}
-
-	if (isset($keywords)) {
-		$siteinfo["keywords"] = array();
-		foreach ($keywords as $keyword)
-			if (!in_array(trim($keyword), $siteinfo["keywords"]))
-				$siteinfo["keywords"][] = trim($keyword);
-	}
-
-	//$list = $xpath->query("head/meta[@property]");
-	$list = $xpath->query("//meta[@property]");
-	foreach ($list as $node) {
-		$attr = array();
-		if ($node->attributes->length)
-			foreach ($node->attributes as $attribute)
-				$attr[$attribute->name] = $attribute->value;
-
-		$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
-
-		if ($attr["content"] != "")
-			switch (strtolower($attr["property"])) {
-				case "og:image":
-					$siteinfo["image"] = $attr["content"];
-					break;
-				case "og:title":
-					$siteinfo["title"] = $attr["content"];
-					break;
-				case "og:description":
-					$siteinfo["text"] = $attr["content"];
-					break;
-			}
-	}
-
-	if ((@$siteinfo["image"] == "") AND !$no_guessing) {
-	    $list = $xpath->query("//img[@src]");
-	    foreach ($list as $node) {
-		$attr = array();
-		if ($node->attributes->length)
-		    foreach ($node->attributes as $attribute)
-			$attr[$attribute->name] = $attribute->value;
-
-			$src = completeurl($attr["src"], $url);
-			$photodata = get_photo_info($src);
-
-			if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) {
-				if ($photodata[0] > 300) {
-					$photodata[1] = round($photodata[1] * (300 / $photodata[0]));
-					$photodata[0] = 300;
-				}
-				if ($photodata[1] > 300) {
-					$photodata[0] = round($photodata[0] * (300 / $photodata[1]));
-					$photodata[1] = 300;
-				}
-				$siteinfo["images"][] = array("src"=>$src,
-								"width"=>$photodata[0],
-								"height"=>$photodata[1]);
-			}
-
-		}
-    } elseif ($siteinfo["image"] != "") {
-		$src = completeurl($siteinfo["image"], $url);
-
-		unset($siteinfo["image"]);
-
-		$photodata = get_photo_info($src);
-
-		if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10))
-			$siteinfo["images"][] = array("src"=>$src,
-							"width"=>$photodata[0],
-							"height"=>$photodata[1]);
-	}
-
-	if ((@$siteinfo["text"] == "") AND (@$siteinfo["title"] != "") AND !$no_guessing) {
-		$text = "";
-
-		$list = $xpath->query("//div[@class='article']");
-		foreach ($list as $node)
-			if (strlen($node->nodeValue) > 40)
-				$text .= " ".trim($node->nodeValue);
-
-		if ($text == "") {
-			$list = $xpath->query("//div[@class='content']");
-			foreach ($list as $node)
-				if (strlen($node->nodeValue) > 40)
-					$text .= " ".trim($node->nodeValue);
-		}
-
-		// If none text was found then take the paragraph content
-		if ($text == "") {
-			$list = $xpath->query("//p");
-			foreach ($list as $node)
-				if (strlen($node->nodeValue) > 40)
-					$text .= " ".trim($node->nodeValue);
-		}
-
-		if ($text != "") {
-			$text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text));
-
-			while (strpos($text, "  "))
-				$text = trim(str_replace("  ", " ", $text));
-
-			$siteinfo["text"] = trim(html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...');
-		}
-	}
-
-	logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
-
-	call_hooks('getsiteinfo', $siteinfo);
-
-	return($siteinfo);
-}
-
-function arr_add_hashes(&$item,$k) {
-	$item = '#' . $item;
-}
+require_once("include/items.php");
 
 function parse_url_content(&$a) {
 
-	require_once("include/items.php");
-
 	$text = null;
-	$str_tags = '';
+	$str_tags = "";
 
 	$textmode = false;
 
-	if(local_user() && (! feature_enabled(local_user(),'richtext')))
+	if (local_user() && (!feature_enabled(local_user(), "richtext"))) {
 		$textmode = true;
+	}
 
-	//if($textmode)
-	$br = (($textmode) ? "\n" : '<br />');
+	$br = (($textmode) ? "\n" : "<br />");
 
-	if(x($_GET,'binurl'))
-		$url = trim(hex2bin($_GET['binurl']));
-	else
-		$url = trim($_GET['url']);
+	if (x($_GET,"binurl")) {
+		$url = trim(hex2bin($_GET["binurl"]));
+	} else {
+		$url = trim($_GET["url"]);
+	}
 
-	if($_GET['title'])
-		$title = strip_tags(trim($_GET['title']));
+	if ($_GET["title"]) {
+		$title = strip_tags(trim($_GET["title"]));
+	}
 
-	if($_GET['description'])
-		$text = strip_tags(trim($_GET['description']));
+	if ($_GET["description"]) {
+		$text = strip_tags(trim($_GET["description"]));
+	}
 
-	if($_GET['tags']) {
-		$arr_tags = str_getcsv($_GET['tags']);
-		if(count($arr_tags)) {
-			array_walk($arr_tags,'arr_add_hashes');
-			$str_tags = $br . implode(' ',$arr_tags) . $br;
+	if ($_GET["tags"]) {
+		$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
+		if (count($arr_tags)) {
+			$str_tags = $br . implode(" ", $arr_tags) . $br;
 		}
 	}
 
-	// add url scheme if missing
+	// Add url scheme if it is missing
 	$arrurl = parse_url($url);
-	if (!x($arrurl, 'scheme')) {
-		if (x($arrurl, 'host'))
+	if (!x($arrurl, "scheme")) {
+		if (x($arrurl, "host")) {
 			$url = "http:".$url;
-		else
+		} else {
 			$url = "http://".$url;
+		}
 	}
 
-	logger('parse_url: ' . $url);
+	logger("prse_url: " . $url);
 
-	if($textmode)
-		$template = '[bookmark=%s]%s[/bookmark]%s';
-	else
+	// Check if the URL is an image, video or audio file. If so format
+	// the URL with the corresponding BBCode media tag
+	$redirects = 0;
+	// Fetch the header of the URL
+	$result = z_fetch_url($url, false, $redirects, array("novalidate" => true, "nobody" => true));
+	if($result["success"]) {
+		// Convert the header fields into an array
+		$hdrs = array();
+		$h = explode("\n", $result["header"]);
+		foreach ($h as $l) {
+			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
+			$hdrs[$k] = $v;
+		}
+		if (array_key_exists("Content-Type", $hdrs)) {
+			$type = $hdrs["Content-Type"];
+		}
+		if ($type) {
+			if(stripos($type, "image/") !== false) {
+				echo $br . "[img]" . $url . "[/img]" . $br;
+				killme();
+			}
+			if (stripos($type, "video/") !== false) {
+				echo $br . "[video]" . $url . "[/video]" . $br;
+				killme();
+			}
+			if (stripos($type, "audio/") !== false) {
+				echo $br . "[audio]" . $url . "[/audio]" . $br;
+				killme();
+			}
+		}
+	}
+
+	if ($textmode) {
+		$template = "[bookmark=%s]%s[/bookmark]%s";
+	} else {
 		$template = "<a class=\"bookmark\" href=\"%s\" >%s</a>%s";
+	}
 
-	$arr = array('url' => $url, 'text' => '');
+	$arr = array("url" => $url, "text" => "");
 
-	call_hooks('parse_link', $arr);
+	call_hooks("parse_link", $arr);
 
-	if(strlen($arr['text'])) {
-		echo $arr['text'];
+	if (strlen($arr["text"])) {
+		echo $arr["text"];
 		killme();
 	}
 
+	// If there is allready some content information submitted we don't
+	// need to parse the url for content.
+	if ($url && $title && $text) {
 
-	if($url && $title && $text) {
+		$title = str_replace(array("\r","\n"),array("",""),$title);
 
-		$title = str_replace(array("\r","\n"),array('',''),$title);
-
-		if($textmode)
-			$text = '[quote]' . trim($text) . '[/quote]' . $br;
-		else {
-			$text = '<blockquote>' . htmlspecialchars(trim($text)) . '</blockquote><br />';
+		if ($textmode) {
+			$text = "[quote]" . trim($text) . "[/quote]" . $br;
+		} else {
+			$text = "<blockquote>" . htmlspecialchars(trim($text)) . "</blockquote><br />";
 			$title = htmlspecialchars($title);
 		}
 
-		$result = sprintf($template,$url,($title) ? $title : $url,$text) . $str_tags;
+		$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
 
-		logger('parse_url (unparsed): returns: ' . $result);
+		logger("parse_url (unparsed): returns: " . $result);
 
 		echo $result;
 		killme();
 	}
 
-	$siteinfo = parseurl_getsiteinfo($url);
+	// Fetch the information directly from the webpage
+	$siteinfo = ParseUrl::getSiteinfo($url);
 
 	unset($siteinfo["keywords"]);
 
+	// Format it as BBCode attachment
 	$info = add_page_info_data($siteinfo);
 
-	if (!$textmode)
+	if (!$textmode) {
 		// Replace ' with ’ - not perfect - but the richtext editor has problems otherwise
 		$info = str_replace(array("&#039;"), array("&#8217;"), $info);
+	}
 
 	echo $info;
 
 	killme();
 }
-?>
+
+/**
+ * @brief Legacy function to call ParseUrl::getSiteinfoCached
+ * 
+ * Note: We have moved the function to ParseUrl.php. This function is only for
+ * legacy support and will be remove in the future
+ * 
+ * @param type $url The url of the page which should be scraped
+ * @param type $no_guessing If true the parse doens't search for
+ *    preview pictures
+ * @param type $do_oembed The false option is used by the function fetch_oembed()
+ *    to avoid endless loops
+ * 
+ * @return array which contains needed data for embedding
+ * 
+ * @see ParseUrl::getSiteinfoCached()
+ * 
+ * @todo Remove this function after all Addons has been changed to use
+ *    ParseUrl::getSiteinfoCached
+ */
+function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
+	$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
+	return $siteinfo;
+}

mod/ping.php

@@ -3,43 +3,119 @@ require_once("include/datetime.php");
 require_once('include/bbcode.php');
 require_once('include/ForumManager.php');
 require_once('include/group.php');
-require_once("mod/proxy.php");
+require_once('mod/proxy.php');
 require_once('include/xml.php');
 
-function ping_init(&$a) {
+/**
+ * @brief Outputs the counts and the lists of various notifications
+ *
+ * The output format can be controlled via the GET parameter 'format'. It can be
+ * - xml (deprecated legacy default)
+ * - json (outputs JSONP with the 'callback' GET parameter)
+ *
+ * Expected JSON structure:
+ * {
+ *		"result": {
+ *			"intro": 0,
+ *			"mail": 0,
+ *			"net": 0,
+ *			"home": 0,
+ *			"register": 0,
+ *			"all-events": 0,
+ *			"all-events-today": 0,
+ *			"events": 0,
+ *			"events-today": 0,
+ *			"birthdays": 0,
+ *			"birthdays-today": 0,
+ *			"groups": [ ],
+ *			"forums": [ ],
+ *			"notify": 0,
+ *			"notifications": [ ],
+ *			"sysmsgs": {
+ *				"notice": [ ],
+ *				"info": [ ]
+ *			}
+ *		}
+ *	}
+ *
+ * @param App $a The Friendica App instance
+ */
+function ping_init(App $a)
+{
+	$format = 'xml';
 
-	$xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">";
+	if (isset($_GET['format']) && $_GET['format'] == 'json') {
+		$format = 'json';
+	}
+
+	$tags          = array();
+	$comments      = array();
+	$likes         = array();
+	$dislikes      = array();
+	$friends       = array();
+	$posts         = array();
+	$regs          = array();
+	$mails         = array();
+	$notifications = array();
+
+	$intro_count    = 0;
+	$mail_count     = 0;
+	$home_count     = 0;
+	$network_count  = 0;
+	$register_count = 0;
+	$sysnotify_count = 0;
+	$groups_unseen  = array();
+	$forums_unseen  = array();
+
+	$all_events       = 0;
+	$all_events_today = 0;
+	$events           = 0;
+	$events_today     = 0;
+	$birthdays        = 0;
+	$birthdays_today  = 0;
+
+	$data = array();
+	$data['intro']    = $intro_count;
+	$data['mail']     = $mail_count;
+	$data['net']      = $network_count;
+	$data['home']     = $home_count;
+	$data['register'] = $register_count;
+
+	$data['all-events']       = $all_events;
+	$data['all-events-today'] = $all_events_today;
+	$data['events']           = $events;
+	$data['events-today']     = $events_today;
+	$data['birthdays']        = $birthdays;
+	$data['birthdays-today']  = $birthdays_today;
 
 	if (local_user()){
 		// Different login session than the page that is calling us.
 		if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
-		        $data = array("invalid" => 1);
-			header("Content-type: text/xml");
-			echo xml::from_array(array("result" => $data), $xml);
+
+			$data = array('result' => array('invalid' => 1));
+
+			if ($format == 'json') {
+				if (isset($_GET['callback'])) {
+					// JSONP support
+					header("Content-type: application/javascript");
+					echo $_GET['callback'] . '(' . json_encode($data) . ')';
+				} else {
+					header("Content-type: application/json");
+					echo json_encode($data);
+				}
+			} else {
+				header("Content-type: text/xml");
+				echo xml::from_array($data, $xml);
+			}
 			killme();
 		}
 
 		$notifs = ping_get_notifications(local_user());
-		$sysnotify = 0; // we will update this in a moment
 
-		$tags = array();
-		$comments = array();
-		$likes = array();
-		$dislikes = array();
-		$friends = array();
-		$posts = array();
-		$regs = array();
-		$mails = array();
-
-		$home = 0;
-		$network = 0;
-		$groups_unseen = array();
-		$forums_unseen = array();
-
-		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
+		$items_unseen = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
 				`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
-				`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
-				FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
+				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
+				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
 				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
 				AND `item`.`contact-id` != %d
@@ -47,110 +123,90 @@ function ping_init(&$a) {
 			intval(local_user()), intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
-
-			$arr = array('items' => $r);
+		if (dbm::is_result($items_unseen)) {
+			$arr = array('items' => $items_unseen);
 			call_hooks('network_ping', $arr);
 
-			foreach ($r as $it) {
-
-				if ($it['wall'])
-					$home ++;
-				else
-					$network ++;
-
-				switch($it['verb']){
-					case ACTIVITY_TAG:
-						$obj = parse_xml_string($xmlhead.$it['object']);
-						$it['tname'] = $obj->content;
-						$tags[] = $it;
-						break;
-					case ACTIVITY_LIKE:
-						$likes[] = $it;
-						break;
-					case ACTIVITY_DISLIKE:
-						$dislikes[] = $it;
-						break;
-					case ACTIVITY_FRIEND:
-						$obj = parse_xml_string($xmlhead.$it['object']);
-						$it['fname'] = $obj->title;
-						$friends[] = $it;
-						break;
-					default:
-						if ($it['parent']!=$it['id']) {
-							$comments[] = $it;
-						} else {
-							if (!$it['wall'])
-								$posts[] = $it;
-						}
+			foreach ($items_unseen as $item) {
+				if ($item['wall']) {
+					$home_count++;
+				} else {
+					$network_count++;
 				}
 			}
 		}
 
-		if ($network) {
-			if (intval(feature_enabled(local_user(),'groups'))) {
+		if ($network_count) {
+			if (intval(feature_enabled(local_user(), 'groups'))) {
 				// Find out how unseen network posts are spread across groups
-				$groups_unseen = groups_count_unseen();
+				$group_counts = groups_count_unseen();
+				if (dbm::is_result($group_counts)) {
+					foreach ($group_counts as $group_count) {
+						if ($group_count['count'] > 0) {
+							$groups_unseen[] = $group_count;
+						}
+					}
+				}
 			}
 
-			if (intval(feature_enabled(local_user(),'forumlist_widget'))) {
-				$forums_unseen = ForumManager::count_unseen_items();
+			if (intval(feature_enabled(local_user(), 'forumlist_widget'))) {
+				$forum_counts = ForumManager::count_unseen_items();
+				if (dbm::is_result($forums_counts)) {
+					foreach ($forums_counts as $forum_count) {
+						if ($forum_count['count'] > 0) {
+							$forums_unseen[] = $forum_count;
+						}
+					}
+				}
 			}
 		}
 
-		$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
+		$intros1 = qu("SELECT  `intro`.`id`, `intro`.`datetime`,
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
 			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
+			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
 			intval(local_user())
 		);
-		$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
+		$intros2 = qu("SELECT `intro`.`id`, `intro`.`datetime`,
 			`contact`.`name`, `contact`.`url`, `contact`.`photo`
 			FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
+			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
 			intval(local_user())
 		);
 
-		$intro = count($intros1) + count($intros2);
+		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1+$intros2;
 
 		$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-		$mails = q("SELECT * FROM `mail`
+		$mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
 			WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 			intval(local_user()),
 			dbesc($myurl)
 		);
-		$mail = count($mails);
+		$mail_count = count($mails);
 
 		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-			$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
-			if ($regs)
-				$register = $regs[0]['total'];
-		} else {
-			$register = "0";
+			$regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+				FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
+				WHERE `contact`.`self` = 1");
+			if ($regs) {
+				$register_count = $regs[0]['total'];
+			}
 		}
 
-		$all_events = 0;
-		$all_events_today = 0;
-		$events = 0;
-		$events_today = 0;
-		$birthdays = 0;
-		$birthdays_today = 0;
-
-
-		$ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+		$ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
 			WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
 			ORDER BY `start` ASC ",
 			intval(local_user()),
-			dbesc(datetime_convert('UTC','UTC','now + 7 days')),
-			dbesc(datetime_convert('UTC','UTC','now'))
+			dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
+			dbesc(datetime_convert('UTC', 'UTC', 'now'))
 		);
 
 		if (dbm::is_result($ev)) {
 			$all_events = intval($ev[0]['total']);
 
 			if ($all_events) {
-				$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
+				$str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
 				foreach($ev as $x) {
 					$bd = false;
 					if ($x['type'] === 'birthday') {
@@ -160,7 +216,7 @@ function ping_init(&$a) {
 					else {
 						$events ++;
 					}
-					if (datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
+					if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
 						$all_events_today ++;
 						if ($bd)
 							$birthdays_today ++;
@@ -171,99 +227,70 @@ function ping_init(&$a) {
 			}
 		}
 
-	        $data = array();
-	        $data["intro"] = $intro;
-	        $data["mail"] = $mail;
-	        $data["net"] = $network;
-	        $data["home"] = $home;
+		$data['intro']    = $intro_count;
+		$data['mail']     = $mail_count;
+		$data['net']      = $network_count;
+		$data['home']     = $home_count;
+		$data['register'] = $register_count;
 
-		if ($register!=0)
-		        $data["register"] = $register;
+		$data['all-events']       = $all_events;
+		$data['all-events-today'] = $all_events_today;
+		$data['events']           = $events;
+		$data['events-today']     = $events_today;
+		$data['birthdays']        = $birthdays;
+		$data['birthdays-today']  = $birthdays_today;
 
-		$groups = array();
-
-		if (dbm::is_result($groups_unseen)) {
-			$count = 0;
-			foreach ($groups_unseen as $it)
-				if ($it['count'] > 0) {
-					$count++;
-					$groups[$count.":group"] = $it['count'];
-					$groups[$count.":@attributes"] = array("id" => $it['id']);
+		if (dbm::is_result($notifs)) {
+			foreach ($notifs as $notif) {
+				if ($notif['seen'] == 0) {
+					$sysnotify_count ++;
 				}
-			$data["groups"] = $groups;
-		}
-
-		$forums = array();
-
-		if (dbm::is_result($forums_unseen)) {
-			$count = 0;
-			foreach ($forums_unseen as $it)
-				if ($it['count'] > 0) {
-					$count++;
-					$forums[$count.":forum"] = $it['count'];
-					$forums[$count.":@attributes"] = array("id" => $it['id']);
-				}
-			$data["forums"] = $forums;
-		}
-
-		$data["all-events"] = $all_events;
-		$data["all-events-today"] = $all_events_today;
-		$data["events"] = $events;
-		$data["events-today"] = $events_today;
-		$data["birthdays"] = $birthdays;
-		$data["birthdays-today"] = $birthdays_today;
-
-
-		if (dbm::is_result($notifs) && !$sysnotify) {
-			foreach ($notifs as $zz) {
-				if ($zz['seen'] == 0)
-					$sysnotify ++;
 			}
 		}
 
 		// merge all notification types in one array
 		if (dbm::is_result($intros)) {
-			foreach ($intros as $i) {
-				$n = array(
-					'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
-					'name' => $i['name'],
-					'url' => $i['url'],
-					'photo' => $i['photo'],
-					'date' => $i['datetime'],
-					'seen' => false,
-					'message' => t("{0} wants to be your friend"),
+			foreach ($intros as $intro) {
+				$notif = array(
+					'href'    => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+					'name'    => $intro['name'],
+					'url'     => $intro['url'],
+					'photo'   => $intro['photo'],
+					'date'    => $intro['datetime'],
+					'seen'    => false,
+					'message' => t('{0} wants to be your friend'),
 				);
-				$notifs[] = $n;
+				$notifs[] = $notif;
 			}
 		}
 
 		if (dbm::is_result($mails)) {
-			foreach ($mails as $i) {
-				$n = array(
-					'href' => $a->get_baseurl().'/message/'.$i['id'],
-					'name' => $i['from-name'],
-					'url' => $i['from-url'],
-					'photo' => $i['from-photo'],
-					'date' => $i['created'],
-					'seen' => false,
-					'message' => t("{0} sent you a message"),
+			foreach ($mails as $mail) {
+				$notif = array(
+					'href'    => $a->get_baseurl() . '/message/' . $mail['id'],
+					'name'    => $mail['from-name'],
+					'url'     => $mail['from-url'],
+					'photo'   => $mail['from-photo'],
+					'date'    => $mail['created'],
+					'seen'    => false,
+					'message' => t('{0} sent you a message'),
 				);
-				$notifs[] = $n;
+				$notifs[] = $notif;
 			}
 		}
 
 		if (dbm::is_result($regs)) {
-			foreach ($regs as $i) {
-				$n = array(
-					'href' => $a->get_baseurl().'/admin/users/',
-					'name' => $i['name'],
-					'url' => $i['url'],
-					'photo' => $i['micro'],
-					'date' => $i['created'],
-					'seen' => false,
-					'message' => t("{0} requested registration"),
+			foreach ($regs as $reg) {
+				$notif = array(
+					'href'    => $a->get_baseurl() . '/admin/users/',
+					'name'    => $reg['name'],
+					'url'     => $reg['url'],
+					'photo'   => $reg['micro'],
+					'date'    => $reg['created'],
+					'seen'    => false,
+					'message' => t('{0} requested registration'),
 				);
-				$notifs[] = $n;
+				$notifs[] = $notif;
 			}
 		}
 
@@ -279,68 +306,79 @@ function ping_init(&$a) {
 		usort($notifs, $sort_function);
 
 		if (dbm::is_result($notifs)) {
-
-			// Are the nofications calles from the regular process or via the friendica app?
+			// Are the nofications called from the regular process or via the friendica app?
 			$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
 
-			$count = 0;
-			foreach($notifs as $n) {
-				$count++;
-				if ($a->is_friendica_app() OR !$regularnotifications)
-					$n['message'] = str_replace("{0}", $n['name'], $n['message']);
+			foreach ($notifs as $notif) {
+				if ($a->is_friendica_app() OR !$regularnotifications) {
+					$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
+				}
 
-				$notifications[$count.":note"] = $n['message'];
+				$contact = get_contact_details_by_url($notif['url']);
+				if (isset($contact['micro'])) {
+					$notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO);
+				} else {
+					$notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO);
+				}
 
-				$contact = get_contact_details_by_url($n['url']);
-				if (isset($contact["micro"]))
-					$n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
-				else
-					$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
-
-				$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
-
-				call_hooks('ping_xmlize', $n);
-
-				$notifications[$count.":@attributes"] = array("id" => $n["id"],
-										"href" => $n['href'],
-										"name" => $n['name'],
-										"url" => $n['url'],
-										"photo" => $n['photo'],
-										"date" => relative_date($n['date']),
-										"seen" => $n['seen'],
-										"timestamp" => strtotime($local_time));
+				$local_time = datetime_convert('UTC', date_default_timezone_get(), $notif['date']);
 
+				$notifications[] = array(
+					'id'        => $notif['id'],
+					'href'      => $notif['href'],
+					'name'      => $notif['name'],
+					'url'       => $notif['url'],
+					'photo'     => $notif['photo'],
+					'date'      => relative_date($notif['date']),
+					'message'   => $notif['message'],
+					'seen'      => $notif['seen'],
+					'timestamp' => strtotime($local_time)
+				);
 			}
 		}
-
-		$data["notif"] = $notifications;
-		$data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register);
 	}
 
-	$sysmsg = array();
+	$sysmsgs = array();
+	$sysmsgs_info = array();
 
-	if (x($_SESSION,'sysmsg')){
-		$count = 0;
-		foreach ($_SESSION['sysmsg'] as $m){
-			$count++;
-			$sysmsg[$count.":notice"] = $m;
-		}
+	if (x($_SESSION, 'sysmsg')) {
+		$sysmsgs = $_SESSION['sysmsg'];
 		unset($_SESSION['sysmsg']);
 	}
 
-	if (x($_SESSION,'sysmsg_info')){
-		$count = 0;
-		foreach ($_SESSION['sysmsg_info'] as $m){
-			$count++;
-			$sysmsg[$count.":info"] = $m;
-		}
+	if (x($_SESSION, 'sysmsg_info')) {
+		$sysmsgs_info = $_SESSION['sysmsg_info'];
 		unset($_SESSION['sysmsg_info']);
 	}
 
-	$data["sysmsgs"] = $sysmsg;
+	if ($format == 'json') {
+		$data['groups'] = $groups_unseen;
+		$data['forums'] = $forums_unseen;
+		$data['notify'] = $sysnotify_count + $intro_count + $mail_count + $register_count;
+		$data['notifications'] = $notifications;
+		$data['sysmsgs'] = array(
+			'notice' => $sysmsgs,
+			'info' => $sysmsgs_info
+		);
+
+		$json_payload = json_encode(array("result" => $data));
+
+		if (isset($_GET['callback'])) {
+			// JSONP support
+			header("Content-type: application/javascript");
+			echo $_GET['callback'] . '(' . $json_payload . ')';
+		} else {
+			header("Content-type: application/json");
+			echo $json_payload;
+		}
+	} else {
+		// Legacy slower XML format output
+		$data = ping_format_xml_data($data, $sysnotify_count, $notifications, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen);
+
+		header("Content-type: text/xml");
+		echo xml::from_array(array("result" => $data), $xml);
+	}
 
-	header("Content-type: text/xml");
-	echo xml::from_array(array("result" => $data), $xml);
 	killme();
 }
 
@@ -350,19 +388,19 @@ function ping_init(&$a) {
  * @param int $uid User id
  * @return array Associative array of notifications
  */
-function ping_get_notifications($uid) {
-
-	$result = array();
-	$offset = 0;
-	$seen = false;
+function ping_get_notifications($uid)
+{
+	$result  = array();
+	$offset  = 0;
+	$seen    = false;
 	$seensql = "NOT";
-	$order = "DESC";
-	$quit = false;
+	$order   = "DESC";
+	$quit    = false;
 
 	$a = get_app();
 
 	do {
-		$r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+		$r = qu("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
 			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
 			WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
 			AND NOT (`notify`.`type` IN (%d, %d))
@@ -422,3 +460,71 @@ function ping_get_notifications($uid) {
 
 	return($result);
 }
+
+/**
+ * @brief Backward-compatible XML formatting for ping.php output
+ * @deprecated
+ *
+ * @param array $data The initial ping data array
+ * @param int $sysnotify_count Number of unseen system notifications
+ * @param array $notifs Complete list of notification
+ * @param array $sysmsgs List of system notice messages
+ * @param array $sysmsgs_info List of system info messages
+ * @param int $groups_unseen Number of unseen group items
+ * @param int $forums_unseen Number of unseen forum items
+ * @return array XML-transform ready data array
+ */
+function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
+{
+	$notifications = array();
+	foreach($notifs as $key => $notif) {
+		$notifications[$key . ':note'] = $notif['message'];
+
+		$notifications[$key . ':@attributes'] = array(
+			'id'        => $notif['id'],
+			'href'      => $notif['href'],
+			'name'      => $notif['name'],
+			'url'       => $notif['url'],
+			'photo'     => $notif['photo'],
+			'date'      => $notif['date'],
+			'seen'      => $notif['seen'],
+			'timestamp' => $notif['timestamp']
+		);
+	}
+
+	$sysmsg = array();
+	foreach ($sysmsgs as $key => $m){
+		$sysmsg[$key . ':notice'] = $m;
+	}
+	foreach ($sysmsgs_info as $key => $m){
+		$sysmsg[$key . ':info'] = $m;
+	}
+
+	$data['notif'] = $notifications;
+	$data['@attributes'] = array('count' => $sysnotify_count + $data['intro'] + $data['mail'] + $data['register']);
+	$data['sysmsgs'] = $sysmsg;
+
+	if ($data['register'] == 0) {
+		unset($data['register']);
+	}
+
+	$groups = array();
+	if (count($groups_unseen)) {
+		foreach ($groups_unseen as $key => $item) {
+			$groups[$key . ':group'] = $item['count'];
+			$groups[$key . ':@attributes'] = array('id' => $item['id']);
+		}
+		$data['groups'] = $groups;
+	}
+
+	$forums = array();
+	if (count($forums_unseen)) {
+		foreach ($forums_unseen as $key => $item) {
+			$forums[$count . ':forum'] = $item['count'];
+			$forums[$count . ':@attributes'] = array('id' => $item['id']);
+		}
+		$data['forums'] = $forums;
+	}
+
+	return $data;
+}

mod/proxy.php

@@ -233,66 +233,87 @@ function proxy_init() {
 	killme();
 }
 
-function proxy_url($url, $writemode = false, $size = "") {
-	global $_SERVER;
-
+/**
+ * @brief Transform a remote URL into a local one
+ *
+ * This function only performs the URL replacement on http URL and if the
+ * provided URL isn't local, "the isn't deactivated" (sic) and if the config
+ * system.proxy_disabled is set to false.
+ *
+ * @param string $url       The URL to proxyfy
+ * @param bool   $writemode Returns a local path the remote URL should be saved to
+ * @param string $size      One of the PROXY_SIZE_* constants
+ *
+ * @return string The proxyfied URL or relative path
+ */
+function proxy_url($url, $writemode = false, $size = '') {
 	$a = get_app();
 
 	if (substr($url, 0, strlen('http')) !== 'http') {
-		return($url);
+		return $url;
 	}
 
 	// Only continue if it isn't a local image and the isn't deactivated
 	if (proxy_is_local_image($url)) {
-		$url = str_replace(normalise_link($a->get_baseurl())."/", $a->get_baseurl()."/", $url);
-		return($url);
+		$url = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $url);
+		return $url;
 	}
 
-	if (get_config("system", "proxy_disabled"))
-		return($url);
+	if (get_config('system', 'proxy_disabled')) {
+		return $url;
+	}
+
+	// Image URL may have encoded ampersands for display which aren't desirable for proxy
+	$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
 
 	// Creating a sub directory to reduce the amount of files in the cache directory
-	$basepath = $a->get_basepath()."/proxy";
+	$basepath = $a->get_basepath() . '/proxy';
 
-	$path = substr(hash("md5", $url), 0, 2);
+	$shortpath = hash('md5', $url);
+	$longpath = substr($shortpath, 0, 2);
 
-	if (is_dir($basepath) and $writemode)
-		if (!is_dir($basepath."/".$path)) {
-			mkdir($basepath."/".$path);
-			chmod($basepath."/".$path, 0777);
+	if (is_dir($basepath) and $writemode) {
+		if (!is_dir($basepath . '/' . $longpath)) {
+			mkdir($basepath . '/' . $longpath);
+			chmod($basepath . '/' . $longpath, 0777);
 		}
-
-	$path .= "/".strtr(base64_encode($url), '+/', '-_');
-
-	// Checking for valid extensions. Only add them if they are safe
-	$pos = strrpos($url, ".");
-	if ($pos) {
-		$extension = strtolower(substr($url, $pos+1));
-		$pos = strpos($extension, "?");
-		if ($pos)
-			$extension = substr($extension, 0, $pos);
 	}
 
-	$extensions = array("jpg", "jpeg", "gif", "png");
+	$longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
 
-	if (in_array($extension, $extensions))
-		$path .= ".".$extension;
+	// Checking for valid extensions. Only add them if they are safe
+	$pos = strrpos($url, '.');
+	if ($pos) {
+		$extension = strtolower(substr($url, $pos + 1));
+		$pos = strpos($extension, '?');
+		if ($pos) {
+			$extension = substr($extension, 0, $pos);
+		}
+	}
 
-	$proxypath = $a->get_baseurl()."/proxy/".$path;
+	$extensions = array('jpg', 'jpeg', 'gif', 'png');
+	if (in_array($extension, $extensions)) {
+		$shortpath .= '.' . $extension;
+		$longpath .= '.' . $extension;
+	}
 
-	if ($size != "")
-		$size = ":".$size;
+	$proxypath = $a->get_baseurl() . '/proxy/' . $longpath;
+
+	if ($size != '') {
+		$size = ':' . $size;
+	}
 
 	// Too long files aren't supported by Apache
 	// Writemode in combination with long files shouldn't be possible
-	if ((strlen($proxypath) > 250) AND $writemode)
-		return (hash("md5", $url));
-	elseif (strlen($proxypath) > 250)
-		return ($a->get_baseurl()."/proxy/".hash("md5", $url)."?url=".urlencode($url));
-	elseif ($writemode)
-		return ($path);
-	else
-		return ($proxypath.$size);
+	if ((strlen($proxypath) > 250) AND $writemode) {
+		return $shortpath;
+	} elseif (strlen($proxypath) > 250) {
+		return $a->get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+	} elseif ($writemode) {
+		return $longpath;
+	} else {
+		return $proxypath . $size;
+	}
 }
 
 /**

mod/register.php

@@ -113,12 +113,13 @@ function register_post(&$a) {
 		}
 
 		$hash = random_string();
-		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
+		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
 			dbesc($hash),
 			dbesc(datetime_convert()),
 			intval($user['uid']),
 			dbesc($result['password']),
-			dbesc($lang)
+			dbesc($lang),
+			dbesc($_POST['permonlybox'])
 		);
 
 		// invite system
@@ -133,6 +134,7 @@ function register_post(&$a) {
 			$admin_mail_list
 		);
 
+		// send notification to admins
 		foreach ($adminlist as $admin) {
 			notification(array(
 				'type' => NOTIFY_SYSTEM,
@@ -149,6 +151,11 @@ function register_post(&$a) {
 				'show_in_notification_page' => false
 			));
 		}
+		// send notification to the user, that the registration is pending
+		send_register_pending_eml(
+				$user['email'],
+				$a->config['sitename'],
+				$user['username']);
 
 		info( t('Your registration is pending approval by the site owner.') . EOL ) ;
 		goaway(z_root());
@@ -256,6 +263,8 @@ function register_content(&$a) {
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
 		'$invitations' => get_config('system','invitation_only'),
+		'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
+		'$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')),
 		'$invite_desc' => t('Membership on this site is by invitation only.'),
 		'$invite_label' => t('Your invitation ID: '),
 		'$invite_id' => $invite_id,

mod/settings.php

@@ -301,6 +301,7 @@ function settings_post(&$a) {
 		$infinite_scroll   = x($_POST, 'infinite_scroll')   ? intval($_POST['infinite_scroll'])    : 0;
 		$no_auto_update    = x($_POST, 'no_auto_update')    ? intval($_POST['no_auto_update'])     : 0;
 		$bandwidth_saver   = x($_POST, 'bandwidth_saver')   ? intval($_POST['bandwidth_saver'])    : 0;
+		$nowarn_insecure   = x($_POST, 'nowarn_insecure')   ? intval($_POST['nowarn_insecure'])    : 0;
 		$browser_update    = x($_POST, 'browser_update')    ? intval($_POST['browser_update'])     : 0;
 		if ($browser_update != -1) {
 			$browser_update = $browser_update * 1000;
@@ -321,6 +322,7 @@ function settings_post(&$a) {
 			set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
 		}
 
+		set_pconfig(local_user(), 'system', 'nowarn_insecure'         , $nowarn_insecure);
 		set_pconfig(local_user(), 'system', 'update_interval'         , $browser_update);
 		set_pconfig(local_user(), 'system', 'itemspage_network'       , $itemspage_network);
 		set_pconfig(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
@@ -951,6 +953,8 @@ function settings_content(&$a) {
 		$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
 		$mobile_theme_selected = (!x($_SESSION,'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']);
 
+		$nowarn_insecure = intval(get_pconfig(local_user(), 'system', 'nowarn_insecure'));
+
 		$browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
 		if (intval($browser_update) != -1)
 			$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
@@ -995,6 +999,7 @@ function settings_content(&$a) {
 
 			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
 			'$mobile_theme'	=> array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false),
+			'$nowarn_insecure' => array('nowarn_insecure',  t('Suppress warning of insecure networks'), $nowarn_insecure, t("Should the system suppress the warning that the current group contains members of networks that can't receive non public postings.")),
 			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')),
 			'$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
 			'$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),

mod/viewcontacts.php

@@ -47,7 +47,7 @@ function viewcontacts_content(&$a) {
 	}
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
-		WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+		WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
 			AND `network` IN ('%s', '%s', '%s')",
 		intval($a->profile['uid']),
 		dbesc(NETWORK_DFRN),
@@ -58,7 +58,7 @@ function viewcontacts_content(&$a) {
 		$a->set_pager_total($r[0]['total']);
 
 	$r = q("SELECT * FROM `contact`
-		WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+		WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
 			AND `network` IN ('%s', '%s', '%s')
 		ORDER BY `name` ASC LIMIT %d, %d",
 		intval($a->profile['uid']),

mod/worker.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * @file mod/worker.php
+ * @brief Module for running the poller as frontend process
+ */
+require_once("include/poller.php");
+
+use \Friendica\Core\Config;
+use \Friendica\Core\PConfig;
+
+function worker_init($a){
+
+	if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+		return;
+	}
+
+	// We don't need the following lines if we can execute background jobs.
+	// So we just wake up the worker if it sleeps.
+	if (function_exists("proc_open")) {
+		call_worker_if_idle();
+		return;
+	}
+
+	clear_worker_processes();
+
+	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
+
+	if ($workers[0]["processes"] > Config::get("system", "worker_queues", 4)) {
+		return;
+	}
+
+	$a->start_process();
+
+	logger("Front end worker started: ".getmypid());
+
+	call_worker();
+
+	if ($r = poller_worker_process()) {
+
+		// On most configurations this parameter wouldn't have any effect.
+		// But since it doesn't destroy anything, we just try to get more execution time in any way.
+		set_time_limit(0);
+
+		poller_execute($r[0]);
+	}
+
+	call_worker();
+
+	$a->end_process();
+
+	logger("Front end worker ended: ".getmypid());
+
+	killme();
+}

spec/dfrn2_contact_confirmation.svg

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="1633" height="2173" viewBox="0 0 1633 2173">
+<style type="text/css"><![CDATA[
+text { font:12px Dialog; }
+]]></style>
+<rect x="-485" y="-485" width="2603" height="3143" style="fill:rgb(255,255,255);stroke:none" />
+<clipPath id="clip1"><path d="M614,37 L1056,37 L1056,106 L614,106 L614,37 Z" /></clipPath>
+<path d="M616,39 L616,103 L1053,103 L1053,39 Z" style="fill:rgb(202,221,254);stroke:none" clip-path="url(#clip1)" />
+<clipPath id="clip2"><path d="M614,37 L1056,37 L1056,106 L614,106 L614,37 Z" /></clipPath>
+<path d="M616,39 L616,103 L1053,103 L1053,39 Z" style="fill:none;stroke:rgb(61,83,127)" clip-path="url(#clip2)" />
+<text x="649" y="76" style="font:18px Open Sans">Friendica - Contact confirmation</text>
+<clipPath id="clip3"><path d="M1198,202 L1388,202 L1388,244 L1198,244 L1198,202 Z" /></clipPath>
+<path d="M1208,204 C1203.5820313,204 1200,207.5820313 1200,212 L1200,233 C1200,237.4179688 1203.5820313,241 1208,241 L1377,241 C1381.4179688,241 1385,237.4179688 1385,233 L1385,212 C1385,207.5820313 1381.4179688,204 1377,204 Z" style="fill:rgb(0,131,191);stroke:none" clip-path="url(#clip3)" />
+<clipPath id="clip4"><path d="M1198,202 L1388,202 L1388,244 L1198,244 L1198,202 Z" /></clipPath>
+<path d="M1208,204 C1203.5820313,204 1200,207.5820313 1200,212 L1200,233 C1200,237.4179688 1203.5820313,241 1208,241 L1377,241 C1381.4179688,241 1385,237.4179688 1385,233 L1385,212 C1385,207.5820313 1381.4179688,204 1377,204 Z" style="fill:none;stroke:rgb(0,131,191)" clip-path="url(#clip4)" />
+<text x="1213" y="225" style="font:13px Tahoma">bob@example.com</text>
+<image x="0" y="0" width="1374" height="231" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABV4AAADnCAYAAADmQE2RAAAIU0lEQVR42u3dTW+UZRSA4SYSfoACIi4EhERCJAhWpXZKUT4UEaGlRVuMgNQQlKCoGEBIGbUCEgsUkK+2YFsUUSIxhoVGkUBLCkIRypcSoOUPqCy6sceZUQyZoC5cel3JWUzeOZtneefN8+bkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPB/EBH/aQAAAAAAyJIdUgt3ne+V2NVeld905ofUdGVm19m2RNOZZPqZ8AoAAAAA8C9ujKiPNp18elTdyWu9R1bEvaU7Y8r6szG5+kwULtsfwxdui/yG9p8Tje3ThFcAAAAAgH9wPaCO2dFWmmg43X1fxd64Y9KxGDm/PUq3dETp5o4oSU3xxssxevlXUdB4untMw6lS4RUAAAAA4G+k42mi7njvRP0Pv+S9vj8mV1+KCVUXY/rWjnh6W0eU1XZGYeWFGDijLYbNbY+B4+pjTGP7r3kfnuwjvAIAAAAA3EQmvG5rSw57cVPkLToXRTVX4pntnanpiLK6zijaeDnyl52PQbNORt+px+K28a0xpHxlJLaeqBJeAQAAAABuIh1P8zcfbxswuiYefPVM5mqBstqOKK/vjBk7OmP86osx+q0LUZg8F3eXH4i+4/dE/7ylkVv15dnUek8nCAAAAACQJRNeNxzryn2pLaasv/zH9QJ1nfHszs54ruFq5K+4EE+u/SkeWHgwRr36USxqORyLj7ZE0ZZPfkut93OCAAAAAABZMuF1XWvX4yvP/3Wva3kmvF6Nok2Xo8/M76P39ANx/8t7YnFrSxStaYyH5qzKxNfBBQUFThAAAAAAIEsmvL5/pC3x2r4o2nglSrdcyXxQK/3Ga8mWizFg1rdxz+zGmPBOU0xYXh8F8+viieSGeKPlcHevQYNGOEEAAAAAgCyZj2utak4On7M+xiZ/jKEVp+KpdZeivPZSFFe3RtGaT2Npa3PM2b0vXtj9eUxdvSMWp34/9s7G5tR6bycIAAAAAJAlHV7z3jvcJ//dQz+Pmrcvbh1/NAbPbIvitSeipHpvvNnaHGOXbouy2s9i7t4vMtF13Nt1XXfmThmeWu/hBAEAAAAAsqTDa+at17cOTns4+V13//xN8cAr7TEx+XUsOXIoSqobY+CkDZG/YHsUV9dHwZLa7qGz11akVnuk9wAAAAAAyHI9vGbuel1xoGTUsm+u3fd8TeTN+yDePNoc4xZVx6TKmljaejjGrtjZNXzu1pmptVuu7wAAAAAAkOXG8JqewspveyUqv6nKXfDx2eJ1Tb+l4+uSI4e6JyZrDt0+cuK9OX++6Sq8AgAAAAD8jezwekNQ7ZmafkMeeaSg1113jcj540NaPbL/9ztNv3iKQ/ZEAwAAAABJRU5ErkJggg==" /><clipPath id="clip5"><path d="M181,198 L432,198 L432,240 L181,240 L181,198 Z" /></clipPath>
+<path d="M191,200 C186.5820313,200 183,203.5820313 183,208 L183,229 C183,233.4179688 186.5820313,237 191,237 L421,237 C425.4179688,237 429,233.4179688 429,229 L429,208 C429,203.5820313 425.4179688,200 421,200 Z" style="fill:rgb(0,131,191);stroke:none" clip-path="url(#clip5)" />
+<clipPath id="clip6"><path d="M181,198 L432,198 L432,240 L181,240 L181,198 Z" /></clipPath>
+<path d="M191,200 C186.5820313,200 183,203.5820313 183,208 L183,229 C183,233.4179688 186.5820313,237 191,237 L421,237 C425.4179688,237 429,233.4179688 429,229 L429,208 C429,203.5820313 425.4179688,200 421,200 Z" style="fill:none;stroke:rgb(0,131,191)" clip-path="url(#clip6)" />
+<text x="197" y="221" style="font:13px Tahoma">karen@karenhompage.com</text>
+<image x="0" y="0" width="418" height="227" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAaIAAADjCAYAAADHeBASAAAE2klEQVR42u3cS29VVRiAYRKNP0ApIg64CImEQEAEbe0pF6EookKhBSlGQGoISlBQDNeUg1RAI5cCcm3BtiiiRGIMAw0goYUUhHIpNyVAyx9AGXRCP3eP0RinLXHyPMkanazJmrz59l5nd+oEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+PiGjXAoAODdHwvVc7p/Y2luXWXDqfrJbM2nu5IVVzKd32mxABcN9C9HzNuSnZFefuZg0uif5Fe2L8xsvxyrpLMXzZoRg4f0fkVjXeSVU3ThIiADo8RCN2NxSlqi62Dio5EI+NOx2D5zZG0bamKNraFIXJmrj5Zgxb/mPkVV9sHVF1oUiIAOiwEKUqzmSlKs//nvPBoWQCuhFjyq7H5O1NMWVHU0zd1RzDS69Fr2kNMWB2Y/QaXRkjqhv/yPniXBchAqBjQrSjIT3g7S2Rs/BKFJTfitd2NicriVBFcxQkk1DusqvRe8a56DrhdDySXx99i1dHavvZMiECoENClLv1TEPPYeXxzIJLmUdxU3c1RXFlc0zb3Rz5a6/HsJXXYnj6SjxRfDS65u+PHjlLYkjZD5eT7Q85QQDaH6JNp1uGvNMQ4zfe/OtxXDIJvb6nOd6ouh25K67Fy+t/i6Hzj0X2gi9j4YnaWHTqRBRs+/pesr2bEwSg/SHaUN/y4uqr/7wXKs6E6HYUbLkZXab/ElmTj8bT7+6PRfVJgD6tjmdnrcnEqE9eXp4TBKD9IfrsZEPq/YNRsPlWFG27lbmg0DYRFW67Hj1nHIknZ1bHmFU1MWZ5ZeTNrYiX0pviwxO1rZ17937KCQLQ7hCl1tSlB87aGKPSv0a/kgvx6oYbUbzrRkxcV59MQN/Ekvq6mLXvYLy177uYsHZ3MhnVxQurNtcl27OcIADtDlHOJ7Vdcj8+fid7zsF4OP9U9JneEBPXn43CdQdiaRKdUUt2JFPStzH7wPeZCI3+qKLl8SHjBybbH3SCALQ7RJmpaOWxSc+lf27tkbslhr7XGGPTP8Xik8eTGFVHr3GbInfezmRCqoy8xbta+81cX9IWIde3AeiwEGXeFa04Wpi97PDdQW+WR86cz2PpqWT6WbguxpWWx5L62hi1Yk/LwNnbpyfbHvBlBQA6PESZj56WHumcKj1cNmTeV5cnbqi51xajZDJqHZsuP/7o4LH9/56EhAiA+xKifwWm7c+q3fqOHJnXuXv3tttxWf+NUNv6E/vueIp8e9bqAAAAAElFTkSuQmCC" /><clipPath id="clip7"><path d="M215,325 L390,325 L390,367 L215,367 L215,325 Z" /></clipPath>
+<path d="M224,326 C219.5820313,326 216,329.5820313 216,334 L216,357 C216,361.4179688 219.5820313,365 224,365 L380,365 C384.4179688,365 388,361.4179688 388,357 L388,334 C388,329.5820313 384.4179688,326 380,326 Z" style="fill:rgb(127,127,127);stroke:none" clip-path="url(#clip7)" />
+<text x="230" y="348" style="font:13px Open Sans">notifications.php</text>
+<clipPath id="clip8"><path d="M30,409 L580,409 L580,566 L30,566 L30,409 Z" /></clipPath>
+<path d="M39,410 C34.5820313,410 31,413.5820313 31,418 L31,556 C31,560.4179688 34.5820313,564 39,564 L570,564 C574.4179688,564 578,560.4179688 578,556 L578,418 C578,413.5820313 574.4179688,410 570,410 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip8)" />
+<text x="45" y="432" style="font:13px Open Sans">notifications_content()</text>
+<text x="45" y="455" style="font:13px Open Sans">-----------------------------------------</text>
+<text x="45" y="501" style="font:13px Open Sans">- This is the page where Karen see Bobs friendship request</text>
+<text x="45" y="524" style="font:13px Open Sans">- the submit form redirects to Karens local dfrn_confirm page </text>
+<text x="45" y="547" style="font:13px Open Sans">($dfrn_id, $contact_id, $intro_id are submitted)</text>
+<clipPath id="clip9"><path d="M219,640 L399,640 L399,682 L219,682 L219,640 Z" /></clipPath>
+<path d="M228,641 C223.5820313,641 220,644.5820313 220,649 L220,672 C220,676.4179688 223.5820313,680 228,680 L389,680 C393.4179688,680 397,676.4179688 397,672 L397,649 C397,644.5820313 393.4179688,641 389,641 Z" style="fill:rgb(127,127,127);stroke:none" clip-path="url(#clip9)" />
+<text x="234" y="663" style="font:13px Open Sans">dfrn_confirm.php</text>
+<clipPath id="clip10"><path d="M14,698 L594,698 L594,1798 L14,1798 L14,698 Z" /></clipPath>
+<path d="M23,699 C18.5820313,699 15,702.5820313 15,707 L15,1788 C15,1792.4179688 18.5820313,1796 23,1796 L584,1796 C588.4179688,1796 592,1792.4179688 592,1788 L592,707 C592,702.5820313 588.4179688,699 584,699 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip10)" />
+<text x="29" y="721" style="font:13px Open Sans">dfrn_confirm_post()</text>
+<text x="29" y="744" style="font:13px Open Sans">SCENARIO 1 ( no $_POST['source_url'] available)</text>
+<text x="29" y="767" style="font:13px Open Sans">--------------------------------------------------------------------------------</text>
+<text x="29" y="813" style="font:13px Open Sans">- contact data come either form $handsfree (if autoconfirm) or </text>
+<text x="29" y="836" style="font:13px Open Sans">from $_POST</text>
+<text x="29" y="882" style="font:13px Open Sans">- get all data about Karen form the user table</text>
+<text x="29" y="928" style="font:13px Open Sans">[Note: Bob have been issued an ID (contact issue-id) when he first </text>
+<text x="29" y="951" style="font:13px Open Sans">requested the friendship. Locate Bobs contact record. At this </text>
+<text x="29" y="974" style="font:13px Open Sans">time, his record will have both pending and blocked set to 1. </text>
+<text x="29" y="997" style="font:13px Open Sans">There won't be any dfrn_id if this is a network follower, so use </text>
+<text x="29" y="1020" style="font:13px Open Sans">the contact_id instead]</text>
+<text x="29" y="1066" style="font:13px Open Sans">- search for Bob in the contact table by contact_id, dfrn_id and </text>
+<text x="29" y="1089" style="font:13px Open Sans">issued-id not empty (for the uid -&gt; Karens user id)</text>
+<text x="29" y="1135" style="font:13px Open Sans">- if network = dfrn </text>
+<text x="29" y="1158" style="font:13px Open Sans">  -&gt; create a new keypair (prvkey &amp; pubkey) and update the </text>
+<text x="29" y="1181" style="font:13px Open Sans">contact</text>
+<text x="29" y="1227" style="font:13px Open Sans">[Note: Generate a key pair for all further communications with </text>
+<text x="29" y="1250" style="font:13px Open Sans">this person. We have a keypair for every contact, and a site key </text>
+<text x="29" y="1273" style="font:13px Open Sans">for unknown people. This provides a means to carry on </text>
+<text x="29" y="1296" style="font:13px Open Sans">relationships with other people any single key is compromised. It </text>
+<text x="29" y="1319" style="font:13px Open Sans">is a robust key. We're much more worried about key leakage </text>
+<text x="29" y="1342" style="font:13px Open Sans">than anybody cracking it.]</text>
+<text x="29" y="1388" style="font:13px Open Sans">	-&gt; update Bobs contact record (in the contact table) with the </text>
+<text x="29" y="1411" style="font:13px Open Sans">generated prvkey</text>
+<text x="29" y="1457" style="font:13px Open Sans">  -&gt; encrypting the dfrn_id with Karens prvkey (Bob can decrypt it </text>
+<text x="29" y="1480" style="font:13px Open Sans">on the other and with Karens site-pubkey) and add it to the </text>
+<text x="29" y="1503" style="font:13px Open Sans">transmit params.</text>
+<text x="29" y="1549" style="font:13px Open Sans">	-&gt; encrypting Karens profile url with Bobs site-pubkey (Bob </text>
+<text x="29" y="1572" style="font:13px Open Sans">can decrypt it with his own private key)  and add it to the </text>
+<text x="29" y="1595" style="font:13px Open Sans">transmit params.</text>
+<text x="29" y="1641" style="font:13px Open Sans">	-&gt; add the above generated public key to params which </text>
+<text x="29" y="1664" style="font:13px Open Sans">getting transmitted (if $aes_allow -&gt; encrypt the the public key)</text>
+<text x="29" y="1710" style="font:13px Open Sans">	-&gt; add duplex state and page-flags to the params</text>
+<text x="29" y="1756" style="font:13px Open Sans">  -&gt; send params to Bobs dfrn_confirm page ($res = </text>
+<text x="29" y="1779" style="font:13px Open Sans">post_url($dfrn_confirm,$params);</text>
+<clipPath id="clip11"><path d="M1041,1319 L1619,1319 L1619,1913 L1041,1913 L1041,1319 Z" /></clipPath>
+<path d="M1050,1320 C1045.5820313,1320 1042,1323.5820313 1042,1328 L1042,1903 C1042,1907.4179688 1045.5820313,1911 1050,1911 L1609,1911 C1613.4179688,1911 1617,1907.4179688 1617,1903 L1617,1328 C1617,1323.5820313 1613.4179688,1320 1609,1320 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip11)" />
+<text x="1055" y="1342" style="font:13px Open Sans">dfrn_confirm_post()</text>
+<text x="1055" y="1365" style="font:13px Open Sans">SCENARIO 2 ( $_POST['source_url'] is available)</text>
+<text x="1055" y="1388" style="font:13px Open Sans">------------------------------------------------------------------------</text>
+<text x="1055" y="1434" style="font:13px Open Sans">- get all data about Bob from the user table (prvkey and uid form </text>
+<text x="1055" y="1457" style="font:13px Open Sans">Bob )</text>
+<text x="1055" y="1503" style="font:13px Open Sans">- decrypt the transmitted source_url  (profile url) with Bobs </text>
+<text x="1055" y="1526" style="font:13px Open Sans">prvkey</text>
+<text x="1055" y="1572" style="font:13px Open Sans">- get data of Karen from contact table by her source_url (and by </text>
+<text x="1055" y="1595" style="font:13px Open Sans">her user id)</text>
+<text x="1055" y="1641" style="font:13px Open Sans">- decrypt the dfrn_id sent by Karen with Karens site-pubkey </text>
+<text x="1055" y="1664" style="font:13px Open Sans">(taken from contact table)</text>
+<text x="1055" y="1710" style="font:13px Open Sans">- if possible decrpyt the pubkey sent by Karen with the prvkey of </text>
+<text x="1055" y="1733" style="font:13px Open Sans">Bob (taken from user table) -&gt; if this is not possible use the raw </text>
+<text x="1055" y="1756" style="font:13px Open Sans">pubkey</text>
+<text x="1055" y="1802" style="font:13px Open Sans">- search if the dfrn_id is already present in the contact table (if it </text>
+<text x="1055" y="1825" style="font:13px Open Sans">is prensent it is a duplicate)</text>
+<text x="1055" y="1871" style="font:13px Open Sans">- update dfrn-id and pubkey for Karens contact entry in the </text>
+<text x="1055" y="1894" style="font:13px Open Sans">contact table</text>
+<clipPath id="clip12"><path d="M42,1841 L559,1841 L559,1906 L42,1906 L42,1841 Z" /></clipPath>
+<path d="M51,1842 C46.5820313,1842 43,1845.5820313 43,1850 L43,1896 C43,1900.4179688 46.5820313,1904 51,1904 L549,1904 C553.4179688,1904 557,1900.4179688 557,1896 L557,1850 C557,1845.5820313 553.4179688,1842 549,1842 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip12)" />
+<text x="57" y="1864" style="font:13px Open Sans"> -&gt; set the relation for the contact and set pending = 0 and </text>
+<text x="57" y="1887" style="font:13px Open Sans">blocked = 0</text>
+<clipPath id="clip13"><path d="M1128,1950 L1541,1950 L1541,2061 L1128,2061 L1128,1950 Z" /></clipPath>
+<path d="M1137,1951 C1132.5820313,1951 1129,1954.5820313 1129,1959 L1129,2051 C1129,2055.4179688 1132.5820313,2059 1137,2059 L1531,2059 C1535.4179688,2059 1539,2055.4179688 1539,2051 L1539,1959 C1539,1954.5820313 1535.4179688,1951 1531,1951 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip13)" />
+<text x="1142" y="1973" style="font:13px Open Sans">- update the relationship of the contact Karen</text>
+<text x="1142" y="2019" style="font:13px Open Sans">-&gt; if duplex delete the issued-id</text>
+<text x="1142" y="2042" style="font:13px Open Sans">-&gt; set blocked = 0 and pending = 0</text>
+<clipPath id="clip14"><path d="M1241,2117 L1428,2117 L1428,2159 L1241,2159 L1241,2117 Z" /></clipPath>
+<path d="M1250,2118 C1245.5820313,2118 1242,2121.5820313 1242,2126 L1242,2149 C1242,2153.4179688 1245.5820313,2157 1250,2157 L1418,2157 C1422.4179688,2157 1426,2153.4179688 1426,2149 L1426,2126 C1426,2121.5820313 1422.4179688,2118 1418,2118 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip14)" />
+<text x="1255" y="2140" style="font:13px Open Sans">send a notification</text>
+<clipPath id="clip15"><path d="M190,1937 L410,1937 L410,1979 L190,1979 L190,1937 Z" /></clipPath>
+<path d="M199,1938 C194.5820313,1938 191,1941.5820313 191,1946 L191,1969 C191,1973.4179688 194.5820313,1977 199,1977 L400,1977 C404.4179688,1977 408,1973.4179688 408,1969 L408,1946 C408,1941.5820313 404.4179688,1938 400,1938 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip15)" />
+<text x="205" y="1960" style="font:13px Open Sans">delete the intro of Bob</text>
+<clipPath id="clip16"><path d="M156,14 L512,14 L512,125 L156,125 L156,14 Z" /></clipPath>
+<path d="M165,15 C160.5820313,15 157,18.5820313 157,23 L157,115 C157,119.4179688 160.5820313,123 165,123 L502,123 C506.4179688,123 510,119.4179688 510,115 L510,23 C510,18.5820313 506.4179688,15 502,15 Z" style="fill:rgb(255,255,255);stroke:none" clip-path="url(#clip16)" />
+<text x="171" y="38" style="font:13px Open Sans">Note: this chart respects only dfrn </text>
+<text x="171" y="61" style="font:13px Open Sans">contacts and focuses on key exchange </text>
+<text x="171" y="84" style="font:13px Open Sans">(for other areas it might be very </text>
+<text x="171" y="106" style="font:13px Open Sans">incomplete)</text>
+<clipPath id="clip17"><path d="M266,361 L341,361 L341,414 L266,414 L266,361 Z" /></clipPath>
+<path d="M302.4140625,365 L303.1328125,410" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip17)" />
+<clipPath id="clip18"><path d="M266,361 L341,361 L341,414 L266,414 L266,361 Z" /></clipPath>
+<path d="M297.9960938,401.421875 L303.1328125,410 L307.9960938,401.2617188 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip18)" />
+<clipPath id="clip19"><path d="M266,361 L341,361 L341,414 L266,414 L266,361 Z" /></clipPath>
+<path d="M297.9960938,401.421875 L303.1328125,410 L307.9960938,401.2617188 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip19)" />
+<clipPath id="clip20"><path d="M271,676 L346,676 L346,703 L271,703 L271,676 Z" /></clipPath>
+<path d="M308.3515625,680 L308.6445313,699" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip20)" />
+<clipPath id="clip21"><path d="M271,676 L346,676 L346,703 L271,703 L271,676 Z" /></clipPath>
+<path d="M303.5117188,690.4179688 L308.6445313,699 L313.5078125,690.265625 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip21)" />
+<clipPath id="clip22"><path d="M271,676 L346,676 L346,703 L271,703 L271,676 Z" /></clipPath>
+<path d="M303.5117188,690.4179688 L308.6445313,699 L313.5078125,690.265625 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip22)" />
+<clipPath id="clip23"><path d="M270,560 L345,560 L345,645 L270,645 L270,560 Z" /></clipPath>
+<path d="M306.4921875,564 L308.1054688,641" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip23)" />
+<clipPath id="clip24"><path d="M270,560 L345,560 L345,645 L270,645 L270,560 Z" /></clipPath>
+<path d="M302.9257813,632.4453125 L308.1054688,641 L312.9257813,632.2382813 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip24)" />
+<clipPath id="clip25"><path d="M270,560 L345,560 L345,645 L270,645 L270,560 Z" /></clipPath>
+<path d="M302.9257813,632.4453125 L308.1054688,641 L312.9257813,632.2382813 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip25)" />
+<clipPath id="clip26"><path d="M588,1338 L1046,1338 L1046,1770 L588,1770 L588,1338 Z" /></clipPath>
+<path d="M592,1766.2265625 L1042,1342.65625" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip26)" />
+<clipPath id="clip27"><path d="M588,1338 L1046,1338 L1046,1770 L588,1770 L588,1338 Z" /></clipPath>
+<path d="M1039.1210938,1352.2304688 L1042,1342.65625 L1032.265625,1344.9492188 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip27)" />
+<clipPath id="clip28"><path d="M588,1338 L1046,1338 L1046,1770 L588,1770 L588,1338 Z" /></clipPath>
+<path d="M1039.1210938,1352.2304688 L1042,1342.65625 L1032.265625,1344.9492188 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip28)" />
+<clipPath id="clip29"><path d="M263,1792 L338,1792 L338,1846 L263,1846 L263,1792 Z" /></clipPath>
+<path d="M300.4296875,1796 L300.1992188,1842" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip29)" />
+<clipPath id="clip30"><path d="M263,1792 L338,1792 L338,1846 L263,1846 L263,1792 Z" /></clipPath>
+<path d="M295.2421875,1833.3164063 L300.1992188,1842 L305.2421875,1833.3632813 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip30)" />
+<clipPath id="clip31"><path d="M263,1792 L338,1792 L338,1846 L263,1846 L263,1792 Z" /></clipPath>
+<path d="M295.2421875,1833.3164063 L300.1992188,1842 L305.2421875,1833.3632813 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip31)" />
+<clipPath id="clip32"><path d="M1295,1907 L1370,1907 L1370,1955 L1295,1955 L1295,1907 Z" /></clipPath>
+<path d="M1332.9140625,1911 L1333.4453125,1951" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip32)" />
+<clipPath id="clip33"><path d="M1295,1907 L1370,1907 L1370,1955 L1295,1955 L1295,1907 Z" /></clipPath>
+<path d="M1328.3320313,1942.40625 L1333.4453125,1951 L1338.328125,1942.2734375 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip33)" />
+<clipPath id="clip34"><path d="M1295,1907 L1370,1907 L1370,1955 L1295,1955 L1295,1907 Z" /></clipPath>
+<path d="M1328.3320313,1942.40625 L1333.4453125,1951 L1338.328125,1942.2734375 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip34)" />
+<clipPath id="clip35"><path d="M1296,2055 L1371,2055 L1371,2122 L1296,2122 L1296,2055 Z" /></clipPath>
+<path d="M1334,2059 L1334,2118" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip35)" />
+<clipPath id="clip36"><path d="M1296,2055 L1371,2055 L1371,2122 L1296,2122 L1296,2055 Z" /></clipPath>
+<path d="M1329,2109.3398438 L1334,2118 L1339,2109.3398438 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip36)" />
+<clipPath id="clip37"><path d="M1296,2055 L1371,2055 L1371,2122 L1296,2122 L1296,2055 Z" /></clipPath>
+<path d="M1329,2109.3398438 L1334,2118 L1339,2109.3398438 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip37)" />
+<clipPath id="clip38"><path d="M263,1900 L338,1900 L338,1942 L263,1942 L263,1900 Z" /></clipPath>
+<path d="M300,1904 L299.6171875,1938" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip38)" />
+<clipPath id="clip39"><path d="M263,1900 L338,1900 L338,1942 L263,1942 L263,1900 Z" /></clipPath>
+<path d="M294.7148438,1929.2851563 L299.6171875,1938 L304.7148438,1929.3984375 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip39)" />
+<clipPath id="clip40"><path d="M263,1900 L338,1900 L338,1942 L263,1942 L263,1900 Z" /></clipPath>
+<path d="M294.7148438,1929.2851563 L299.6171875,1938 L304.7148438,1929.3984375 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip40)" />
+</svg>

spec/dfrn2_contact_request.svg

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="1458" height="2526" viewBox="0 0 1458 2526">
+<style type="text/css"><![CDATA[
+text { font:12px Dialog; }
+]]></style>
+<rect x="-485" y="-485" width="2428" height="3496" style="fill:rgb(255,255,255);stroke:none" />
+<clipPath id="clip1"><path d="M468,32 L867,32 L867,101 L468,101 L468,32 Z" /></clipPath>
+<path d="M470,34 L470,98 L864,98 L864,34 Z" style="fill:rgb(202,221,254);stroke:none" clip-path="url(#clip1)" />
+<clipPath id="clip2"><path d="M468,32 L867,32 L867,101 L468,101 L468,32 Z" /></clipPath>
+<path d="M470,34 L470,98 L864,98 L864,34 Z" style="fill:none;stroke:rgb(61,83,127)" clip-path="url(#clip2)" />
+<text x="503" y="71" style="font:18px Open Sans">Friendica - Contact request</text>
+<image x="0" y="0" width="834" height="74" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA0IAAABKCAYAAACW5eSEAAAEYElEQVR42u3dyW+VVRjAYRKNf4BSRFwwCImEQEAs2tpbCjIoIkJLC1KMgGAISlBQDGPgKhWQWKCATG3BtiiiRGIMCw0gaQspCGUokxJKyz+AsuiGvt7WIcatq9s8T/Iubr6czdn9cr7v3G7dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKBLi4j/NQAAAGkfQnkHrndPHGgqyam5cjE1bZ1z4GpjouZKsuOZEAIAALpUCD1fc2F6VsWFexnD58Xgov0xeevVmFR6JfJWHY2hi/dETlXT3UR101QhBAAAdIkQGrWvsShRdbl92LzD8djEszF8YVMU7WqJop0tUZiagu3NMXL1D5Fbfbl9VNWlIiEEAACkdQglKs5lJCov/pb9/tGYVHorxpfcjGm7W2L6npaYUd4aeWtuRL+ZjTFkflP0G1sZo6qbfs/+/EIPIQQAAKRvCO1pTA55a0dkL70W+WW349W9ralJRVBFa+Rvb46cVdej/+wL0XPK2XhkXEMMLF4fid3nS4QQAACQtiGUs/NcY9+RZfHMkiudr8LNKG+J4srWmLmvNcZtvBkjP7wReclr8UTxieg57lD0yV4RmSXfX00tf8gOAgAA6RlC2862Zb7dGJO3Nv/5OlxFa7y2vzVer7oTOWtvxMubf40Ri09G1pIvYumpulh25lTk7/rqfmp5LzsIAACkZwhtaWh7cf31f74LKu4MoTuRv6M5esz6OTKmnYin3zkUyxpSAbSpOp6du6Ezhgbk5ubaQQAAID1D6NPTjYn3jkT+9ttRtOt25wUJHSdChbtuRt/Zx+PJOdUxfl1NjF9dGbkLK+Kl5Lb44FRde/f+/Z+ygwAAQFqGUGJDfXLo3K0xJvlLDJp3KV7ZciuKy29FQWlD5G/6OlY01Mfcg0fizYPfxpSN+2JZ6vcL67bXp5Zn2EEAACAtQyj7k7oeOR/X3s1acCQeHncmBsxqjILN56Ow9HCsTEXPmBV7Ykb5NzH/8HedETT2o4q2xzMnD00tf9AOAgAAaRlCnadCH56c+lzyp/Y+OTtixLtNMSH5Yyw/XZuKoeroN3Fb5CzaGwWllZG7vLx90JzN8zoiyPXZAABAWodQ57dCa08UZq06dm/YG2WRveCzWHmmPsYuLY2Ja8piRUNdjFm7v23o/N2zUsse+HsNAABAWodQx+StOd49seZYSeaiL68WbKm53xFDy0/Xtk9IltU+OnzC4G5/nQQJIQAAoMuE0L8Cp+PPUnsNHD06t3vv3h23w2X8N4I65g/3mXiK17zpCgAAAABJRU5ErkJggg==" /><clipPath id="clip3"><path d="M1006,236 L1266,236 L1266,278 L1006,278 L1006,236 Z" /></clipPath>
+<path d="M1016,238 C1011.5820313,238 1008,241.5820313 1008,246 L1008,267 C1008,271.4179688 1011.5820313,275 1016,275 L1255,275 C1259.4179688,275 1263,271.4179688 1263,267 L1263,246 C1263,241.5820313 1259.4179688,238 1255,238 Z" style="fill:rgb(0,131,191);stroke:none" clip-path="url(#clip3)" />
+<clipPath id="clip4"><path d="M1006,236 L1266,236 L1266,278 L1006,278 L1006,236 Z" /></clipPath>
+<path d="M1016,238 C1011.5820313,238 1008,241.5820313 1008,246 L1008,267 C1008,271.4179688 1011.5820313,275 1016,275 L1255,275 C1259.4179688,275 1263,271.4179688 1263,267 L1263,246 C1263,241.5820313 1259.4179688,238 1255,238 Z" style="fill:none;stroke:rgb(0,131,191)" clip-path="url(#clip4)" />
+<text x="1021" y="259" style="font:13px Tahoma">karenn@karenhompage.com</text>
+<image x="0" y="0" width="1252" height="265" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABOQAAAEJCAYAAAA0I/jnAAAIjElEQVR42u3d3ZPNdRzAcTMZf0Ah6cJDzGQMQ6Jse9aSh5LErl2ymhCNUUZRGo/DkQ2ZFos87S7ZVVIm0zQuapBhmSXWw3oqg13/gHKxN/bTOac0xt1hpqvXa+Zzceacz8338j2/3/m2agUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADA/ysiHmkAAAAAgCw8GNjyd19pm9jdUJpbc/Fcapozs/tSfaLmYjL9nSAHAAAAAI/g/rj2cs3ZCQMrz95p12969CreGWPWX4rRZRcjf/GB6DNnW+TuaridqG4YJ8gBAAAAwEO6F9YG76gvTuy60NJ3+r54atSp6DerIYq3NEbx5sYoSk3hxhsxaMnPkVd9oWXwrvPFghwAAAAAPIR0VEtUnm6XqDr3Z87HB2J02fUYUXotxm9tjAnbGmNiRVPkL70aXSfVR+8ZDdF1WFUMrm74K+ers+0FOQAAAADIUibIbatP9n5vU+TMuxwF5Tfjze1NqWmMiZVNUbDxRuQuvhLdppyNDmNPxRPD66JHycpIbD1TKsgBAAAAQJbSUS138+n6LoPK44W5FzOvqE6saIySqqaYtKMphq++FoOWX4385OV4puRwdBi+NzrnLIz+pT9dSq23cYIAAAAAkIVMkNtwqrn/+/UxZv2Nf15TrWyKt3Y2xdu7bkXusqvx+to/YsCcIzFw7tcx7/ixmH/yeBRs+fZuar2jEwQAAACALGSC3Lq65ldXXvnvf+NKMkHuVhRsuhHtJ/8W7cYfjuc/2Bvz645HwZrqeHHaqkyU656Xl+cEAQAAACALmSD3xYn6xEf7o2DjzSjecjNzkUP6CbmiLdeiy5RD8ezU6hixoiZGLKmKvFmV8VpyQ3xy/FhL227dnnOCAAAAAJCFzKUOq2qTfaatj6HJ36Pn9PPxxrrrUVJxPQrL6qJgzXexsK42pu3ZH+/u+SHGrt4R81OfX1mxsTa13s4JAgAAAEAW0kEu5/Nj7XM/O3p74Mz98fjwk9F9cn0Urj0TRWX7YlFdbQxduC0mVnwfM/b9mIlxwz6tbH66/5g+qfXWThAAAAAAspAOcpmn5JYfGfdS8teWzrmbYsCHDTEy+UssOHE0isqqo+uoDZE7e3sUllVF3oKKlp5T105PrbZO7wEAAAAAWbgX5DL/JbfscNHAxQfv9H2nPHJmfhmLTtbGsHllMWppeSysOxZDl+1s7jNj6+TU2mP3dgAAAACALNwf5NKTv/RQ28TSg6X9Z39zqXBdzd10lFtw4mjLyGT50Sf7jezV6t8n4wQ5AAAAAHgIDwa5+0Jbm9R07DFkSF7bTp3St6mmL3Bo/eDv/gYwZniKtpg81wAAAABJRU5ErkJggg==" /><clipPath id="clip5"><path d="M235,234 L425,234 L425,276 L235,276 L235,234 Z" /></clipPath>
+<path d="M245,236 C240.5820313,236 237,239.5820313 237,244 L237,265 C237,269.4179688 240.5820313,273 245,273 L414,273 C418.4179688,273 422,269.4179688 422,265 L422,244 C422,239.5820313 418.4179688,236 414,236 Z" style="fill:rgb(0,131,191);stroke:none" clip-path="url(#clip5)" />
+<clipPath id="clip6"><path d="M235,234 L425,234 L425,276 L235,276 L235,234 Z" /></clipPath>
+<path d="M245,236 C240.5820313,236 237,239.5820313 237,244 L237,265 C237,269.4179688 240.5820313,273 245,273 L414,273 C418.4179688,273 422,269.4179688 422,265 L422,244 C422,239.5820313 418.4179688,236 414,236 Z" style="fill:none;stroke:rgb(0,131,191)" clip-path="url(#clip6)" />
+<text x="251" y="257" style="font:13px Tahoma">bob@example.com</text>
+<image x="0" y="0" width="411" height="263" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZsAAAEHCAYAAAB4POvAAAAFDElEQVR42u3c3ZOOZRzAcTM1/QG1K+nAS8xkDEOibPusl1glFYslqwnRGGUUpWExPLKhpsUir7tkV0mZTNM4qEHGLrPELtaiDHb9A8rBnthf9z5NTdPR4rDPZ+Y6euY6uU6+87vv67k7dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+H+LiPtaAHDXsRm693JWam9DSW7VxXPJasmsvY11qaqL6bbfxAaA+4rN81X1kweX19/OHjAr+hTujrEbGuOV0osxdOmh6Dd/e+TuabiVqmyYIDYA3FNshu2qK0ztudDaf9aBeGzM6RgwtyEKtzZF4ZammJis8Zuux5BlP0Ze5YXWYXvOF4oNAHcVm1T5mexUxbnfcz44lEwy12JUydWYtK0pJm9viik7m2Po8ivRfWpd9J3dEN1HVsSwyoY/cr6o7yg2ALQ/Ntvr0n3f3hw5Cy9FQdmNeG1Hc7KS0JQ3R0Ey0eQuvRw9ptdHp3Gn45H82uhVtDpS286WiA0A7Y5N7pYzdd2GlMUzCy5mHptN2dkURRXNMXVXc+SvvRpDVl6JoelL8UTR0eiUvz+65hTHwJIfGpPtDzlBANoXm42nWwa+UxdjN1z/69FZMtG8vrs53thzM3JXXImX1/0Wg+Yfi8ELvoyFJ6pj0akTUbD16zvJ9s5OEID2xWZ9bcuLqy//856mKBObm1Gw+Xp0nPZLZE86Gk+/uz8W1SaR+bQynp25JhOcnnl5eU4QgPbF5rOTdan3D0bBphtRuPVG5lJA22QzcevV6Db9SDw5ozJGraqKUcsqIm9uebyU3hgfnqhuzerR4yknCEC7YpNaU5PuN3NDjEj/Gr1nnY9X11+Lop3XYnxpbTLJfBPFtTUxc9/BeGvfdzFu7a5kwqmJF1Ztqkm2ZztBANoVm5xPqjvmfnz81uA5B+Ph/FPRc1pdjF93NiaWHoglSVhGFG9Ppp1vY/aB7zOhGflRecvjA8f2S7Y/6AQBaFdsMtPNymMTnkv/3No1d3MMeq8hRqd/isUnjyfBqYzuYzZG7rwdyaRTEXmLd7b2nrFuVltoXH0G4K5ik3l3s+LoxMFLD9/u/2ZZ5Mz5PJacSqaYhaUxZnlZFNdWx4gVu1v6zd42Ldn2gC8IAHBPscl8iHP5kazU8sMlA+d91Th+fdWdtuAkE07r6HTZ8UcHjO7z90QjNgDcc2z+FZG2P2x27jV8eF5Wly5tt86y/xuatvUnRFJ4iu/wPU8AAAAASUVORK5CYII=" /><clipPath id="clip7"><path d="M953,363 L1344,363 L1344,451 L953,451 L953,363 Z" /></clipPath>
+<path d="M962,364 C957.5820313,364 954,367.5820313 954,372 L954,441 C954,445.4179688 957.5820313,449 962,449 L1334,449 C1338.4179688,449 1342,445.4179688 1342,441 L1342,372 C1342,367.5820313 1338.4179688,364 1334,364 Z" style="fill:rgb(127,127,127);stroke:none" clip-path="url(#clip7)" />
+<text x="1073" y="386" style="font:13px Open Sans"> dfrn_request.php</text>
+<text x="1146" y="409" style="font:13px Open Sans">-</text>
+<text x="968" y="432" style="font:13px Open Sans">https://karenhompage/dfrn_request/karin</text>
+<clipPath id="clip8"><path d="M890,808 L1416,808 L1416,1448 L890,1448 L890,808 Z" /></clipPath>
+<path d="M899,809 C894.5820313,809 891,812.5820313 891,817 L891,1438 C891,1442.4179688 894.5820313,1446 899,1446 L1406,1446 C1410.4179688,1446 1414,1442.4179688 1414,1438 L1414,817 C1414,812.5820313 1410.4179688,809 1406,809 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip8)" />
+<text x="904" y="831" style="font:13px Open Sans">dfrn_request_post - SCENARIO 1</text>
+<text x="904" y="854" style="font:13px Open Sans">----------------------------------------------</text>
+<text x="904" y="900" style="font:13px Open Sans">- Cleanup old introductions that remain blocked + Cleanup </text>
+<text x="904" y="923" style="font:13px Open Sans">any old email intros - which will have a greater lifetime</text>
+<text x="904" y="969" style="font:13px Open Sans">- probe_url Bobs posted dfrn_url and get the network with </text>
+<text x="904" y="992" style="font:13px Open Sans">webfinger_dfrn</text>
+<text x="904" y="1038" style="font:13px Open Sans">- try to select all contact data of Bob (contact table) by the </text>
+<text x="904" y="1061" style="font:13px Open Sans">url ($_POST['dfrn_url] and profile uid ($a-&gt;profile['uid']) </text>
+<text x="904" y="1084" style="font:13px Open Sans">where self = 0 to look if this contact is already there (if </text>
+<text x="904" y="1107" style="font:13px Open Sans">issued-id or rel is already available return here because it </text>
+<text x="904" y="1130" style="font:13px Open Sans">seems that we are already connected)</text>
+<text x="904" y="1176" style="font:13px Open Sans">- create a issued-id with $issued_id = random_string();</text>
+<text x="904" y="1222" style="font:13px Open Sans">- if we already found a contact record above update the </text>
+<text x="904" y="1245" style="font:13px Open Sans">issued-id with the one we have created</text>
+<text x="904" y="1291" style="font:13px Open Sans">- otherwise if Bob is not already in the contact table scrape </text>
+<text x="904" y="1314" style="font:13px Open Sans">Bobs profile and create a new contact with this data (e.g. </text>
+<text x="904" y="1337" style="font:13px Open Sans">the scraped issued-id / profiles pubkey becomes contacts </text>
+<text x="904" y="1360" style="font:13px Open Sans">site-pubkey) in the contact table (blocked = 1, pending = 1)</text>
+<text x="904" y="1406" style="font:13px Open Sans">- select this created contact from contact table and create </text>
+<text x="904" y="1429" style="font:13px Open Sans">an intro in the intro table (blocked = 1)</text>
+<clipPath id="clip9"><path d="M925,693 L1374,693 L1374,735 L925,735 L925,693 Z" /></clipPath>
+<path d="M934,694 C929.5820313,694 926,697.5820313 926,702 L926,725 C926,729.4179688 929.5820313,733 934,733 L1364,733 C1368.4179688,733 1372,729.4179688 1372,725 L1372,702 C1372,697.5820313 1368.4179688,694 1364,694 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip9)" />
+<text x="939" y="716" style="font:13px Open Sans">$_POST['dfrn_url'] is transmited and is Bobs profile url</text>
+<clipPath id="clip10"><path d="M888,1557 L1418,1557 L1418,1852 L888,1852 L888,1557 Z" /></clipPath>
+<path d="M897,1558 C892.5820313,1558 889,1561.5820313 889,1566 L889,1842 C889,1846.4179688 892.5820313,1850 897,1850 L1408,1850 C1412.4179688,1850 1416,1846.4179688 1416,1842 L1416,1566 C1416,1561.5820313 1412.4179688,1558 1408,1558 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip10)" />
+<text x="902" y="1580" style="font:13px Open Sans">redirect to Bobs request page</text>
+<text x="902" y="1626" style="font:13px Open Sans">goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"</text>
+<text x="902" y="1649" style="font:13px Open Sans">				. '&amp;dfrn_version=' . </text>
+<text x="902" y="1672" style="font:13px Open Sans">DFRN_PROTOCOL_VERSION</text>
+<text x="902" y="1695" style="font:13px Open Sans">				. '&amp;confirm_key='  . $hash</text>
+<text x="902" y="1718" style="font:13px Open Sans">				. (($aes_allow) ? "&amp;aes_allow=1" : "")</text>
+<text x="902" y="1741" style="font:13px Open Sans">			);</text>
+<text x="902" y="1787" style="font:13px Open Sans">http://example.com/dfrn_request/bob?dfrn_url=6874747</text>
+<text x="902" y="1810" style="font:13px Open Sans">03a2f2f6b6172656e686f6d65706167652e636f6d2f70726f66</text>
+<text x="902" y="1833" style="font:13px Open Sans">696c652f6b6172656e&amp;aes_allow=1&amp;confirm_key=”ABC123”</text>
+<clipPath id="clip11"><path d="M287,1180 L464,1180 L464,1222 L287,1222 L287,1180 Z" /></clipPath>
+<path d="M296,1181 C291.5820313,1181 288,1184.5820313 288,1189 L288,1212 C288,1216.4179688 291.5820313,1220 296,1220 L454,1220 C458.4179688,1220 462,1216.4179688 462,1212 L462,1189 C462,1184.5820313 458.4179688,1181 454,1181 Z" style="fill:rgb(127,127,127);stroke:none" clip-path="url(#clip11)" />
+<text x="302" y="1203" style="font:13px Open Sans">dfrn_request.php</text>
+<clipPath id="clip12"><path d="M134,1399 L624,1399 L624,2315 L134,2315 L134,1399 Z" /></clipPath>
+<path d="M143,1400 C138.5820313,1400 135,1403.5820313 135,1408 L135,2305 C135,2309.4179688 138.5820313,2313 143,2313 L614,2313 C618.4179688,2313 622,2309.4179688 622,2305 L622,1408 C622,1403.5820313 618.4179688,1400 614,1400 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip12)" />
+<text x="149" y="1422" style="font:13px Open Sans">http://example.com/dfrn_request/bob?</text>
+<text x="149" y="1445" style="font:13px Open Sans">dfrn_url=</text>
+<text x="149" y="1468" style="font:13px Open Sans">687474703a2f2f6b6172656e686f6d65706167652e</text>
+<text x="149" y="1491" style="font:13px Open Sans">636f6d2f70726f66696c652f6b6172656e&amp;aes_allow=1&amp;</text>
+<text x="149" y="1514" style="font:13px Open Sans">confirm_key=”ABC123”</text>
+<text x="149" y="1560" style="font:13px Open Sans">dfrn_request_content()</text>
+<text x="149" y="1583" style="font:13px Open Sans">------------------------------------------</text>
+<text x="149" y="1606" style="font:13px Open Sans">- copy the posted parameters (dfrn_url, key and so on) </text>
+<text x="149" y="1629" style="font:13px Open Sans">to $_POST</text>
+<text x="149" y="1698" style="font:13px Open Sans"> dfrn_request_post() - SCENARIO 2 </text>
+<text x="149" y="1721" style="font:13px Open Sans">($_POST['localconfirm'] == 1)</text>
+<text x="149" y="1744" style="font:13px Open Sans">-----------------------------------------------------------------------</text>
+<text x="149" y="1767" style="font:13px Open Sans">- if(local_user() &amp;&amp; ($a-&gt;user['nickname'] == $a-</text>
+<text x="149" y="1790" style="font:13px Open Sans">&gt;argv[1]) &amp;&amp; (x($_POST,'dfrn_url')))</text>
+<text x="149" y="1813" style="font:13px Open Sans">-&gt;</text>
+<text x="149" y="1859" style="font:13px Open Sans">- $confirm_key comes from $_POST</text>
+<text x="149" y="1905" style="font:13px Open Sans">- get data for contact Karen (contact table) by </text>
+<text x="149" y="1928" style="font:13px Open Sans">$dfrn_url (contacts url and nurl) -&gt; if contact Karen </text>
+<text x="149" y="1951" style="font:13px Open Sans">does already have a dfrn-id Bob seems already </text>
+<text x="149" y="1974" style="font:13px Open Sans">connected with Karen (abort here)</text>
+<text x="149" y="2020" style="font:13px Open Sans">- if this contact (Karen) isn't available in the contact </text>
+<text x="149" y="2043" style="font:13px Open Sans">tabel, scrape Karens profile page to pick up the dfrn </text>
+<text x="149" y="2066" style="font:13px Open Sans">links, key, fn, and photo</text>
+<text x="149" y="2112" style="font:13px Open Sans">- create a contact for Karen in the contact table with </text>
+<text x="149" y="2135" style="font:13px Open Sans">the scraped data with blocked = 1 and pending = 1 </text>
+<text x="149" y="2158" style="font:13px Open Sans">(Karens pubkey becomes the contact site-pubkey)</text>
+<text x="149" y="2204" style="font:13px Open Sans">- fetch_url($dfrn_request . '?confirm_key=' . </text>
+<text x="149" y="2227" style="font:13px Open Sans">$confirm_key);</text>
+<text x="149" y="2273" style="font:13px Open Sans">- fetch_url(http://karenhomepage.com/dfrn_request?</text>
+<text x="149" y="2296" style="font:13px Open Sans">confirm_key=”ABC123”)</text>
+<clipPath id="clip13"><path d="M1061,2027 L1238,2027 L1238,2069 L1061,2069 L1061,2027 Z" /></clipPath>
+<path d="M1070,2028 C1065.5820313,2028 1062,2031.5820313 1062,2036 L1062,2059 C1062,2063.4179688 1065.5820313,2067 1070,2067 L1228,2067 C1232.4179688,2067 1236,2063.4179688 1236,2059 L1236,2036 C1236,2031.5820313 1232.4179688,2028 1228,2028 Z" style="fill:rgb(127,127,127);stroke:none" clip-path="url(#clip13)" />
+<text x="1075" y="2050" style="font:13px Open Sans">dfrn_request.php</text>
+<clipPath id="clip14"><path d="M857,2205 L1444,2205 L1444,2454 L857,2454 L857,2205 Z" /></clipPath>
+<path d="M866,2206 C861.5820313,2206 858,2209.5820313 858,2214 L858,2444 C858,2448.4179688 861.5820313,2452 866,2452 L1434,2452 C1438.4179688,2452 1442,2448.4179688 1442,2444 L1442,2214 C1442,2209.5820313 1438.4179688,2206 1434,2206 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip14)" />
+<text x="871" y="2228" style="font:13px Open Sans">http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”</text>
+<text x="871" y="2274" style="font:13px Open Sans">dfrn_request_content() -</text>
+<text x="871" y="2297" style="font:13px Open Sans">(elseif((x($_GET,'confirm_key')) &amp;&amp; strlen($_GET['confirm_key'])) )</text>
+<text x="871" y="2320" style="font:13px Open Sans">----------------------------------------------------------------------------------------------</text>
+<text x="871" y="2366" style="font:13px Open Sans">- select the intro by confirm_key (intro table) -&gt; get contact id</text>
+<text x="871" y="2389" style="font:13px Open Sans">- use the intro contact id to get the contact in the contact table</text>
+<text x="871" y="2412" style="font:13px Open Sans">- build a notification package ( notification(array.....) )</text>
+<text x="871" y="2435" style="font:13px Open Sans">- update intro in intro table (blocked = 0)</text>
+<clipPath id="clip15"><path d="M227,2424 L531,2424 L531,2512 L227,2512 L227,2424 Z" /></clipPath>
+<path d="M236,2425 C231.5820313,2425 228,2428.5820313 228,2433 L228,2502 C228,2506.4179688 231.5820313,2510 236,2510 L521,2510 C525.4179688,2510 529,2506.4179688 529,2502 L529,2433 C529,2428.5820313 525.4179688,2425 521,2425 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip15)" />
+<text x="242" y="2447" style="font:13px Open Sans">Bob stays on his Friendica server</text>
+<text x="242" y="2493" style="font:13px Open Sans">- goaway($forwardurl);</text>
+<clipPath id="clip16"><path d="M14,14 L370,14 L370,125 L14,125 L14,14 Z" /></clipPath>
+<path d="M23,15 C18.5820313,15 15,18.5820313 15,23 L15,115 C15,119.4179688 18.5820313,123 23,123 L360,123 C364.4179688,123 368,119.4179688 368,115 L368,23 C368,18.5820313 364.4179688,15 360,15 Z" style="fill:rgb(255,255,255);stroke:none" clip-path="url(#clip16)" />
+<text x="29" y="38" style="font:13px Open Sans">Note: this chart respects only dfrn </text>
+<text x="29" y="61" style="font:13px Open Sans">contacts and focuses on key exchange </text>
+<text x="29" y="83" style="font:13px Open Sans">(for other areas it might be very </text>
+<text x="29" y="106" style="font:13px Open Sans">incomplete)</text>
+<clipPath id="clip17"><path d="M871,491 L1431,491 L1431,648 L871,648 L871,491 Z" /></clipPath>
+<path d="M880,492 C875.5820313,492 872,495.5820313 872,500 L872,638 C872,642.4179688 875.5820313,646 880,646 L1421,646 C1425.4179688,646 1429,642.4179688 1429,638 L1429,500 C1429,495.5820313 1425.4179688,492 1421,492 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip17)" />
+<text x="885" y="514" style="font:13px Open Sans">dfrn_request_content()</text>
+<text x="885" y="537" style="font:13px Open Sans">------------------------------------</text>
+<text x="885" y="583" style="font:13px Open Sans">- the page for the on Katrins server where Bob do a connection </text>
+<text x="885" y="606" style="font:13px Open Sans">request</text>
+<text x="885" y="629" style="font:13px Open Sans">- the form transmit on submit Bobs profile url as dfrn_url</text>
+<clipPath id="clip18"><path d="M402,267 L974,267 L974,313 L402,313 L402,267 Z" /></clipPath>
+<path d="M422,271.734375 L954,370.5703125" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip18)" />
+<clipPath id="clip19"><path d="M402,329 L974,329 L974,377 L402,377 L402,329 Z" /></clipPath>
+<path d="M422,271.734375 L954,370.5703125" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip19)" />
+<clipPath id="clip20"><path d="M402,311 L974,311 L974,331 L402,331 L402,311 Z" /></clipPath>
+<path d="M422,271.734375 L954,370.5703125" style="fill:none;stroke:rgb(182,44,37);opacity:0.09803921568627451;stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip20)" />
+<clipPath id="clip21"><path d="M402,267 L974,267 L974,377 L402,377 L402,267 Z" /></clipPath>
+<path d="M944.5703125,373.9023438 L954,370.5703125 L946.3984375,364.0703125 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip21)" />
+<clipPath id="clip22"><path d="M402,267 L974,267 L974,377 L402,377 L402,267 Z" /></clipPath>
+<path d="M944.5703125,373.9023438 L954,370.5703125 L946.3984375,364.0703125 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip22)" />
+<text x="405" y="323" style="font:10px Georgia">bob wants to make a request and is directed from karens profile page to karens dfrn-request page</text>
+<clipPath id="clip23"><path d="M1111,729 L1186,729 L1186,813 L1111,813 L1111,729 Z" /></clipPath>
+<path d="M1149.1875,733 L1149.4335938,763.3984375 L1149.5585938,778.6015625 L1149.8046875,809" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip23)" />
+<clipPath id="clip24"><path d="M1111,729 L1186,729 L1186,813 L1111,813 L1111,729 Z" /></clipPath>
+<path d="M1144.734375,800.3789063 L1149.8046875,809 L1154.734375,800.3007813 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip24)" />
+<clipPath id="clip25"><path d="M1111,729 L1186,729 L1186,813 L1111,813 L1111,729 Z" /></clipPath>
+<path d="M1144.734375,800.3789063 L1149.8046875,809 L1154.734375,800.3007813 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip25)" />
+<clipPath id="clip26"><path d="M1115,1442 L1190,1442 L1190,1562 L1115,1562 L1115,1442 Z" /></clipPath>
+<path d="M1152.7773438,1446 L1152.625,1558" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip26)" />
+<clipPath id="clip27"><path d="M1115,1442 L1190,1442 L1190,1562 L1115,1562 L1115,1442 Z" /></clipPath>
+<path d="M1147.6367188,1549.3320313 L1152.625,1558 L1157.6367188,1549.3476563 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip27)" />
+<clipPath id="clip28"><path d="M1115,1442 L1190,1442 L1190,1562 L1115,1562 L1115,1442 Z" /></clipPath>
+<path d="M1147.6367188,1549.3320313 L1152.625,1558 L1157.6367188,1549.3476563 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip28)" />
+<clipPath id="clip29"><path d="M458,1201 L893,1201 L893,1375 L458,1375 L458,1201 Z" /></clipPath>
+<path d="M889,1561.9492188 L462,1205.3515625" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip29)" />
+<clipPath id="clip30"><path d="M458,1391 L893,1391 L893,1565 L458,1565 L458,1391 Z" /></clipPath>
+<path d="M889,1561.9492188 L462,1205.3515625" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip30)" />
+<clipPath id="clip31"><path d="M458,1373 L575,1373 L575,1393 L458,1393 L458,1373 Z" /></clipPath>
+<path d="M889,1561.9492188 L462,1205.3515625" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip31)" />
+<clipPath id="clip32"><path d="M776,1373 L893,1373 L893,1393 L776,1393 L776,1373 Z" /></clipPath>
+<path d="M889,1561.9492188 L462,1205.3515625" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip32)" />
+<clipPath id="clip33"><path d="M573,1373 L778,1373 L778,1393 L573,1393 L573,1373 Z" /></clipPath>
+<path d="M889,1561.9492188 L462,1205.3515625" style="fill:none;stroke:rgb(182,44,37);opacity:0.09803921568627451;stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip33)" />
+<clipPath id="clip34"><path d="M458,1201 L893,1201 L893,1565 L458,1565 L458,1201 Z" /></clipPath>
+<path d="M471.8515625,1207.0664063 L462,1205.3515625 L465.4414063,1214.7421875 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip34)" />
+<clipPath id="clip35"><path d="M458,1201 L893,1201 L893,1565 L458,1565 L458,1201 Z" /></clipPath>
+<path d="M471.8515625,1207.0664063 L462,1205.3515625 L465.4414063,1214.7421875 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip35)" />
+<text x="576" y="1385" style="font:10px Georgia">redirict to bobs dfrn_request page</text>
+<clipPath id="clip36"><path d="M339,1216 L414,1216 L414,1404 L339,1404 L339,1216 Z" /></clipPath>
+<path d="M375.1171875,1220 L376.0625,1400" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip36)" />
+<clipPath id="clip37"><path d="M339,1216 L414,1216 L414,1404 L339,1404 L339,1216 Z" /></clipPath>
+<path d="M371.015625,1391.3671875 L376.0625,1400 L381.015625,1391.3125 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip37)" />
+<clipPath id="clip38"><path d="M339,1216 L414,1216 L414,1404 L339,1404 L339,1216 Z" /></clipPath>
+<path d="M371.015625,1391.3671875 L376.0625,1400 L381.015625,1391.3125 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip38)" />
+<clipPath id="clip39"><path d="M618,2024 L1072,2024 L1072,2158 L618,2158 L618,2024 Z" /></clipPath>
+<path d="M622,2305.015625 L1068.1992188,2028" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip39)" />
+<clipPath id="clip40"><path d="M618,2174 L1072,2174 L1072,2309 L618,2309 L618,2174 Z" /></clipPath>
+<path d="M622,2305.015625 L1068.1992188,2028" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip40)" />
+<clipPath id="clip41"><path d="M618,2156 L650,2156 L650,2176 L618,2176 L618,2156 Z" /></clipPath>
+<path d="M622,2305.015625 L1068.1992188,2028" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip41)" />
+<clipPath id="clip42"><path d="M1041,2156 L1072,2156 L1072,2176 L1041,2176 L1041,2156 Z" /></clipPath>
+<path d="M622,2305.015625 L1068.1992188,2028" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip42)" />
+<clipPath id="clip43"><path d="M648,2156 L1043,2156 L1043,2176 L648,2176 L648,2156 Z" /></clipPath>
+<path d="M622,2305.015625 L1068.1992188,2028" style="fill:none;stroke:rgb(182,44,37);opacity:0.09803921568627451;stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip43)" />
+<clipPath id="clip44"><path d="M618,2024 L1072,2024 L1072,2309 L618,2309 L618,2024 Z" /></clipPath>
+<path d="M1063.4804688,2036.8164063 L1068.1992188,2028 L1058.2070313,2028.3203125 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip44)" />
+<clipPath id="clip45"><path d="M618,2024 L1072,2024 L1072,2309 L618,2309 L618,2024 Z" /></clipPath>
+<path d="M1063.4804688,2036.8164063 L1068.1992188,2028 L1058.2070313,2028.3203125 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip45)" />
+<text x="651" y="2168" style="font:10px Georgia">http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”</text>
+<clipPath id="clip46"><path d="M1111,2063 L1186,2063 L1186,2210 L1111,2210 L1111,2063 Z" /></clipPath>
+<path d="M1149.0703125,2067 L1149.5625,2206" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip46)" />
+<clipPath id="clip47"><path d="M1111,2063 L1186,2063 L1186,2210 L1111,2210 L1111,2063 Z" /></clipPath>
+<path d="M1144.53125,2197.359375 L1149.5625,2206 L1154.53125,2197.3203125 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip47)" />
+<clipPath id="clip48"><path d="M1111,2063 L1186,2063 L1186,2210 L1111,2210 L1111,2063 Z" /></clipPath>
+<path d="M1144.53125,2197.359375 L1149.5625,2206 L1154.53125,2197.3203125 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip48)" />
+<clipPath id="clip49"><path d="M342,2309 L417,2309 L417,2429 L342,2429 L342,2309 Z" /></clipPath>
+<path d="M378.875,2313 L378.5351563,2425" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip49)" />
+<clipPath id="clip50"><path d="M342,2309 L417,2309 L417,2429 L342,2429 L342,2309 Z" /></clipPath>
+<path d="M373.5625,2416.3242188 L378.5351563,2425 L383.5625,2416.3554688 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip50)" />
+<clipPath id="clip51"><path d="M342,2309 L417,2309 L417,2429 L342,2429 L342,2309 Z" /></clipPath>
+<path d="M373.5625,2416.3242188 L378.5351563,2425 L383.5625,2416.3554688 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip51)" />
+<clipPath id="clip52"><path d="M1111,445 L1186,445 L1186,496 L1111,496 L1111,445 Z" /></clipPath>
+<path d="M1148.7851563,449 L1149.3125,492" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip52)" />
+<clipPath id="clip53"><path d="M1111,445 L1186,445 L1186,496 L1111,496 L1111,445 Z" /></clipPath>
+<path d="M1144.2070313,483.4023438 L1149.3125,492 L1154.2070313,483.2773438 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip53)" />
+<clipPath id="clip54"><path d="M1111,445 L1186,445 L1186,496 L1111,496 L1111,445 Z" /></clipPath>
+<path d="M1144.2070313,483.4023438 L1149.3125,492 L1154.2070313,483.2773438 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip54)" />
+<clipPath id="clip55"><path d="M1026,642 L1272,642 L1272,662 L1026,662 L1026,642 Z" /></clipPath>
+<path d="M1149.703125,646 L1149.2695313,694" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip55)" />
+<clipPath id="clip56"><path d="M1026,678 L1272,678 L1272,698 L1026,698 L1026,678 Z" /></clipPath>
+<path d="M1149.703125,646 L1149.2695313,694" style="fill:none;stroke:rgb(182,44,37);stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip56)" />
+<clipPath id="clip57"><path d="M1026,660 L1272,660 L1272,680 L1026,680 L1026,660 Z" /></clipPath>
+<path d="M1149.703125,646 L1149.2695313,694" style="fill:none;stroke:rgb(182,44,37);opacity:0.09803921568627451;stroke-width:3;stroke-dasharray:18,9;stroke-dashoffset:0" clip-path="url(#clip57)" />
+<clipPath id="clip58"><path d="M1026,642 L1272,642 L1272,698 L1026,698 L1026,642 Z" /></clipPath>
+<path d="M1144.3476563,685.296875 L1149.2695313,694 L1154.3476563,685.3867188 Z" style="fill:rgb(182,44,37);stroke:none" clip-path="url(#clip58)" />
+<clipPath id="clip59"><path d="M1026,642 L1272,642 L1272,698 L1026,698 L1026,642 Z" /></clipPath>
+<path d="M1144.3476563,685.296875 L1149.2695313,694 L1154.3476563,685.3867188 Z" style="fill:none;stroke:rgb(182,44,37);stroke-width:3" clip-path="url(#clip59)" />
+<text x="1029" y="672" style="font:10px Georgia">Bob fills request form and presses submit</text>
+</svg>

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1208);
+define('UPDATE_VERSION' , 1209);
 
 /**
  *

util/convert_innodb.sql

@@ -0,0 +1,4 @@
+
+SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;') 
+FROM information_schema.tables 
+WHERE engine = 'MyISAM';

util/daemon.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * @file util/daemon.php
+ * @brief Run the poller from a daemon.
+ *
+ * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
+ */
+function shutdown() {
+	posix_kill(posix_getpid(), SIGHUP);
+}
+
+if (in_array("start", $_SERVER["argv"])) {
+	$mode = "start";
+}
+
+if (in_array("stop", $_SERVER["argv"])) {
+	$mode = "stop";
+}
+
+if (in_array("status", $_SERVER["argv"])) {
+	$mode = "status";
+}
+
+if (!isset($mode)) {
+	die("Please use either 'start', 'stop' or 'status'.\n");
+}
+
+@include(".htconfig.php");
+
+if (!isset($pidfile)) {
+	die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".
+		'$pidfile = "/path/to/daemon.pid";'."\n");
+}
+
+if (in_array($mode, array("stop", "status"))) {
+	$pid = @file_get_contents($pidfile);
+
+	if (!$pid) {
+		die("Pidfile wasn't found. Is the daemon running?\n");
+	}
+}
+
+if ($mode == "status") {
+	if (posix_kill($pid, 0)) {
+		die("Daemon process $pid is running.\n");
+	}
+
+	unlink($pidfile);
+
+	die("Daemon process $pid isn't running.\n");
+}
+
+if ($mode == "stop") {
+	posix_kill($pid, SIGTERM);
+
+	unlink($pidfile);
+
+	die("Worker daemon process $pid was killed.\n");
+}
+
+echo "Starting worker daemon.\n";
+
+if (isset($a->config['php_path'])) {
+	$php = $a->config['php_path'];
+} else {
+	$php = "php";
+}
+
+// Switch over to daemon mode.
+if ($pid = pcntl_fork())
+	return;     // Parent
+
+fclose(STDIN);  // Close all of the standard
+fclose(STDOUT); // file descriptors as we
+fclose(STDERR); // are running as a daemon.
+
+register_shutdown_function('shutdown');
+
+if (posix_setsid() < 0)
+	return;
+
+if ($pid = pcntl_fork())
+	return;     // Parent
+
+$pid = getmypid();
+file_put_contents($pidfile, $pid);
+
+// Now running as a daemon.
+while (true) {
+	// Just to be sure that this script really runs endlessly
+	set_time_limit(0);
+
+	// Call the poller
+	$cmdline = $php.' include/poller.php';
+
+	exec($cmdline);
+
+	// Now sleep for 5 minutes
+	sleep(300);
+}
+?>

util/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-10 15:43+0100\n"
+"POT-Creation-Date: 2016-11-20 21:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Enter name or interest"
 msgstr ""
 
-#: include/contact_widgets.php:32 include/conversation.php:981
-#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66
+#: include/contact_widgets.php:32 include/Contact.php:375
+#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66
 #: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
 #: mod/suggest.php:83
 msgid "Connect/Follow"
@@ -67,12 +67,11 @@ msgid "Find"
 msgstr ""
 
 #: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:203 view/theme/diabook/theme.php:527
+#: view/theme/vier/theme.php:203
 msgid "Friend Suggestions"
 msgstr ""
 
 #: include/contact_widgets.php:36 view/theme/vier/theme.php:202
-#: view/theme/diabook/theme.php:526
 msgid "Similar Interests"
 msgstr ""
 
@@ -81,7 +80,6 @@ msgid "Random Profile"
 msgstr ""
 
 #: include/contact_widgets.php:38 view/theme/vier/theme.php:204
-#: view/theme/diabook/theme.php:528
 msgid "Invite Friends"
 msgstr ""
 
@@ -113,8 +111,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: include/contact_widgets.php:242 include/ForumManager.php:119
-#: include/items.php:2188 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:970
+#: include/items.php:2223 mod/content.php:624 object/Item.php:432
+#: view/theme/vier/theme.php:260 boot.php:971
 msgid "show more"
 msgstr ""
 
@@ -451,138 +449,6 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: include/user.php:39 mod/settings.php:371
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: include/user.php:48
-msgid "An invitation is required."
-msgstr ""
-
-#: include/user.php:53
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: include/user.php:61
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: include/user.php:82
-msgid "Please enter the required information."
-msgstr ""
-
-#: include/user.php:96
-msgid "Please use a shorter name."
-msgstr ""
-
-#: include/user.php:98
-msgid "Name too short."
-msgstr ""
-
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: include/user.php:121
-msgid "Not a valid email address."
-msgstr ""
-
-#: include/user.php:134
-msgid "Cannot use that email."
-msgstr ""
-
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
-msgstr ""
-
-#: include/user.php:147 include/user.php:245
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: include/user.php:157
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr ""
-
-#: include/user.php:173
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: include/user.php:231
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: include/user.php:256 view/theme/duepuntozero/config.php:44
-msgid "default"
-msgstr ""
-
-#: include/user.php:266
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: include/user.php:345 include/user.php:352 include/user.php:359
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:210 mod/profile_photo.php:302
-#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
-#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
-#: mod/photos.php:1819 view/theme/diabook/theme.php:500
-msgid "Profile Photos"
-msgstr ""
-
-#: include/user.php:387
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
-msgstr ""
-
-#: include/user.php:391
-#, php-format
-msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
-msgstr ""
-
-#: include/user.php:423 mod/admin.php:1184
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
 #: include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr ""
@@ -607,19 +473,19 @@ msgstr ""
 msgid "Reputable, has my trust"
 msgstr ""
 
-#: include/contact_selectors.php:56 mod/admin.php:862
+#: include/contact_selectors.php:56 mod/admin.php:887
 msgid "Frequently"
 msgstr ""
 
-#: include/contact_selectors.php:57 mod/admin.php:863
+#: include/contact_selectors.php:57 mod/admin.php:888
 msgid "Hourly"
 msgstr ""
 
-#: include/contact_selectors.php:58 mod/admin.php:864
+#: include/contact_selectors.php:58 mod/admin.php:889
 msgid "Twice daily"
 msgstr ""
 
-#: include/contact_selectors.php:59 mod/admin.php:865
+#: include/contact_selectors.php:59 mod/admin.php:890
 msgid "Daily"
 msgstr ""
 
@@ -644,12 +510,12 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1367 mod/admin.php:1380 mod/admin.php:1392 mod/admin.php:1410
+#: mod/admin.php:1392 mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1436
 msgid "Email"
 msgstr ""
 
 #: include/contact_selectors.php:80 mod/dfrn_request.php:869
-#: mod/settings.php:840
+#: mod/settings.php:842
 msgid "Diaspora"
 msgstr ""
 
@@ -701,10 +567,6 @@ msgstr ""
 msgid "Hubzilla/Redmatrix"
 msgstr ""
 
-#: include/network.php:595
-msgid "view full size"
-msgstr ""
-
 #: include/acl_selectors.php:327
 msgid "Post to Email"
 msgstr ""
@@ -714,7 +576,7 @@ msgstr ""
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr ""
 
-#: include/acl_selectors.php:333 mod/settings.php:1176
+#: include/acl_selectors.php:333 mod/settings.php:1181
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
@@ -723,12 +585,10 @@ msgid "Visible to everybody"
 msgstr ""
 
 #: include/acl_selectors.php:339 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "show"
 msgstr ""
 
 #: include/acl_selectors.php:340 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "don't show"
 msgstr ""
 
@@ -751,25 +611,23 @@ msgstr ""
 
 #: include/like.php:163 include/conversation.php:130
 #: include/conversation.php:266 include/text.php:1808 mod/subthread.php:87
-#: mod/tagger.php:62 view/theme/diabook/theme.php:471
+#: mod/tagger.php:62
 msgid "photo"
 msgstr ""
 
-#: include/like.php:163 include/diaspora.php:1402 include/conversation.php:125
+#: include/like.php:163 include/conversation.php:125
 #: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62
-#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475
+#: include/conversation.php:270 include/diaspora.php:1406 mod/subthread.php:87
+#: mod/tagger.php:62
 msgid "status"
 msgstr ""
 
 #: include/like.php:165 include/conversation.php:122
 #: include/conversation.php:258 include/text.php:1806
-#: view/theme/diabook/theme.php:463
 msgid "event"
 msgstr ""
 
-#: include/like.php:182 include/diaspora.php:1398 include/conversation.php:141
-#: view/theme/diabook/theme.php:480
+#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1402
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -798,9 +656,9 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: include/message.php:145 include/Photo.php:1045 include/Photo.php:1061
-#: include/Photo.php:1069 include/Photo.php:1094 mod/wall_upload.php:218
-#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:477
+#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056
+#: include/Photo.php:1064 include/Photo.php:1089 mod/item.php:477
+#: mod/wall_upload.php:218 mod/wall_upload.php:232 mod/wall_upload.php:239
 msgid "Wall Photos"
 msgstr ""
 
@@ -852,89 +710,6 @@ msgstr[1] ""
 msgid "Done. You can now login with your username and password"
 msgstr ""
 
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr ""
-
-#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:402
-#: view/theme/frio/theme.php:253
-msgid "Network"
-msgstr ""
-
-#: include/NotificationsManager.php:167 mod/profiles.php:703
-#: mod/network.php:845
-msgid "Personal"
-msgstr ""
-
-#: include/NotificationsManager.php:174 include/nav.php:105
-#: include/nav.php:161 view/theme/diabook/theme.php:123
-msgid "Home"
-msgstr ""
-
-#: include/NotificationsManager.php:181 include/nav.php:166
-msgid "Introductions"
-msgstr ""
-
-#: include/NotificationsManager.php:234 include/NotificationsManager.php:245
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:244
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: include/NotificationsManager.php:258
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:269
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: include/NotificationsManager.php:280
-#, php-format
-msgid "%s is attending %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:291
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:302
-#, php-format
-msgid "%s may attend %s's event"
-msgstr ""
-
-#: include/NotificationsManager.php:317
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: include/NotificationsManager.php:750
-msgid "Friend Suggestion"
-msgstr ""
-
-#: include/NotificationsManager.php:783
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: include/NotificationsManager.php:783
-msgid "New Follower"
-msgstr ""
-
-#: include/diaspora.php:1954
-msgid "Sharing notification from Diaspora network"
-msgstr ""
-
-#: include/diaspora.php:2854
-msgid "Attachments:"
-msgstr ""
-
 #: include/features.php:63
 msgid "General Features"
 msgstr ""
@@ -1138,29 +913,6 @@ msgstr ""
 msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr ""
 
-#: include/delivery.php:439
-msgid "(no subject)"
-msgstr ""
-
-#: include/delivery.php:450 include/enotify.php:43
-msgid "noreply"
-msgstr ""
-
-#: include/api.php:1019
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
-msgstr ""
-
-#: include/api.php:1039
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr ""
-
-#: include/api.php:1060
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
-msgstr ""
-
 #: include/bbcode.php:348 include/bbcode.php:1055 include/bbcode.php:1056
 msgid "Image/photo"
 msgstr ""
@@ -1178,419 +930,6 @@ msgstr ""
 msgid "Encrypted content"
 msgstr ""
 
-#: include/conversation.php:147
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:150
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:153
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:185 mod/dfrn_confirm.php:473
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr ""
-
-#: include/conversation.php:219
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: include/conversation.php:239 mod/mood.php:62
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr ""
-
-#: include/conversation.php:278 mod/tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr ""
-
-#: include/conversation.php:303
-msgid "post/item"
-msgstr ""
-
-#: include/conversation.php:304
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr ""
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
-#: mod/photos.php:1607
-msgid "Likes"
-msgstr ""
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
-#: mod/photos.php:1607
-msgid "Dislikes"
-msgstr ""
-
-#: include/conversation.php:586 include/conversation.php:1477
-#: mod/content.php:373 mod/photos.php:1608
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Not attending"
-msgstr ""
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Might attend"
-msgstr ""
-
-#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
-#: mod/photos.php:1681 object/Item.php:133
-msgid "Select"
-msgstr ""
-
-#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/admin.php:1384 mod/contacts.php:808
-#: mod/contacts.php:1016 mod/photos.php:1682 mod/settings.php:739
-#: object/Item.php:134
-msgid "Delete"
-msgstr ""
-
-#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
-#: mod/content.php:911 object/Item.php:367 object/Item.php:368
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: include/conversation.php:765 object/Item.php:355
-msgid "Categories:"
-msgstr ""
-
-#: include/conversation.php:766 object/Item.php:356
-msgid "Filed under:"
-msgstr ""
-
-#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
-#: object/Item.php:381
-#, php-format
-msgid "%s from %s"
-msgstr ""
-
-#: include/conversation.php:789 mod/content.php:513
-msgid "View in context"
-msgstr ""
-
-#: include/conversation.php:791 include/conversation.php:1261
-#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
-#: mod/message.php:548 mod/content.php:515 mod/content.php:948
-#: mod/photos.php:1570 object/Item.php:406
-msgid "Please wait"
-msgstr ""
-
-#: include/conversation.php:870
-msgid "remove"
-msgstr ""
-
-#: include/conversation.php:874
-msgid "Delete Selected Items"
-msgstr ""
-
-#: include/conversation.php:966
-msgid "Follow Thread"
-msgstr ""
-
-#: include/conversation.php:967 include/Contact.php:390
-msgid "View Status"
-msgstr ""
-
-#: include/conversation.php:968 include/conversation.php:984
-#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr ""
-
-#: include/conversation.php:969 include/Contact.php:392
-msgid "View Photos"
-msgstr ""
-
-#: include/conversation.php:970 include/Contact.php:393
-msgid "Network Posts"
-msgstr ""
-
-#: include/conversation.php:971 include/Contact.php:394
-msgid "View Contact"
-msgstr ""
-
-#: include/conversation.php:972 include/Contact.php:396
-msgid "Send PM"
-msgstr ""
-
-#: include/conversation.php:976 include/Contact.php:397
-msgid "Poke"
-msgstr ""
-
-#: include/conversation.php:1094
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: include/conversation.php:1097
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: include/conversation.php:1100
-#, php-format
-msgid "%s attends."
-msgstr ""
-
-#: include/conversation.php:1103
-#, php-format
-msgid "%s doesn't attend."
-msgstr ""
-
-#: include/conversation.php:1106
-#, php-format
-msgid "%s attends maybe."
-msgstr ""
-
-#: include/conversation.php:1116
-msgid "and"
-msgstr ""
-
-#: include/conversation.php:1122
-#, php-format
-msgid ", and %d other people"
-msgstr ""
-
-#: include/conversation.php:1131
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr ""
-
-#: include/conversation.php:1132
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: include/conversation.php:1135
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr ""
-
-#: include/conversation.php:1136
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: include/conversation.php:1139
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr ""
-
-#: include/conversation.php:1140
-#, php-format
-msgid "%s attend."
-msgstr ""
-
-#: include/conversation.php:1143
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr ""
-
-#: include/conversation.php:1144
-#, php-format
-msgid "%s don't attend."
-msgstr ""
-
-#: include/conversation.php:1147
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr ""
-
-#: include/conversation.php:1148
-#, php-format
-msgid "%s anttend maybe."
-msgstr ""
-
-#: include/conversation.php:1187 include/conversation.php:1205
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: include/conversation.php:1188 include/conversation.php:1206
-#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
-#: mod/message.php:299 mod/message.php:442 mod/message.php:450
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: include/conversation.php:1189 include/conversation.php:1207
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: include/conversation.php:1190 include/conversation.php:1208
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: include/conversation.php:1191 include/conversation.php:1209
-msgid "Tag term:"
-msgstr ""
-
-#: include/conversation.php:1192 include/conversation.php:1210
-#: mod/filer.php:30
-msgid "Save to Folder:"
-msgstr ""
-
-#: include/conversation.php:1193 include/conversation.php:1211
-msgid "Where are you right now?"
-msgstr ""
-
-#: include/conversation.php:1194
-msgid "Delete item(s)?"
-msgstr ""
-
-#: include/conversation.php:1242 mod/photos.php:1569
-msgid "Share"
-msgstr ""
-
-#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
-#: mod/message.php:354 mod/message.php:545
-msgid "Upload photo"
-msgstr ""
-
-#: include/conversation.php:1244 mod/editpost.php:111
-msgid "upload photo"
-msgstr ""
-
-#: include/conversation.php:1245 mod/editpost.php:112
-msgid "Attach file"
-msgstr ""
-
-#: include/conversation.php:1246 mod/editpost.php:113
-msgid "attach file"
-msgstr ""
-
-#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
-#: mod/message.php:355 mod/message.php:546
-msgid "Insert web link"
-msgstr ""
-
-#: include/conversation.php:1248 mod/editpost.php:115
-msgid "web link"
-msgstr ""
-
-#: include/conversation.php:1249 mod/editpost.php:116
-msgid "Insert video link"
-msgstr ""
-
-#: include/conversation.php:1250 mod/editpost.php:117
-msgid "video link"
-msgstr ""
-
-#: include/conversation.php:1251 mod/editpost.php:118
-msgid "Insert audio link"
-msgstr ""
-
-#: include/conversation.php:1252 mod/editpost.php:119
-msgid "audio link"
-msgstr ""
-
-#: include/conversation.php:1253 mod/editpost.php:120
-msgid "Set your location"
-msgstr ""
-
-#: include/conversation.php:1254 mod/editpost.php:121
-msgid "set location"
-msgstr ""
-
-#: include/conversation.php:1255 mod/editpost.php:122
-msgid "Clear browser location"
-msgstr ""
-
-#: include/conversation.php:1256 mod/editpost.php:123
-msgid "clear location"
-msgstr ""
-
-#: include/conversation.php:1258 mod/editpost.php:137
-msgid "Set title"
-msgstr ""
-
-#: include/conversation.php:1260 mod/editpost.php:139
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: include/conversation.php:1262 mod/editpost.php:125
-msgid "Permission settings"
-msgstr ""
-
-#: include/conversation.php:1263 mod/editpost.php:154
-msgid "permissions"
-msgstr ""
-
-#: include/conversation.php:1271 mod/editpost.php:134
-msgid "Public post"
-msgstr ""
-
-#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
-#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
-#: mod/photos.php:1725 object/Item.php:729
-msgid "Preview"
-msgstr ""
-
-#: include/conversation.php:1280 include/items.php:1917 mod/fbrowser.php:101
-#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
-#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
-#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
-#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677
-#: mod/settings.php:703
-msgid "Cancel"
-msgstr ""
-
-#: include/conversation.php:1286
-msgid "Post to Groups"
-msgstr ""
-
-#: include/conversation.php:1287
-msgid "Post to Contacts"
-msgstr ""
-
-#: include/conversation.php:1288
-msgid "Private post"
-msgstr ""
-
-#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
-msgid "Message"
-msgstr ""
-
-#: include/conversation.php:1294 mod/editpost.php:153
-msgid "Browser"
-msgstr ""
-
-#: include/conversation.php:1449
-msgid "View all"
-msgstr ""
-
-#: include/conversation.php:1471
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:1474
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:1480
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
 #: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
 msgid "Miscellaneous"
 msgstr ""
@@ -1689,37 +1028,6 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
-msgstr ""
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr ""
-
-#: include/dbstructure.php:183
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: include/dbstructure.php:260
-msgid "Errors encountered performing database changes."
-msgstr ""
-
-#: include/dfrn.php:1107
-#, php-format
-msgid "%s\\'s birthday"
-msgstr ""
-
 #: include/enotify.php:24
 msgid "Friendica Notification"
 msgstr ""
@@ -1738,6 +1046,10 @@ msgstr ""
 msgid "%1$s, %2$s Administrator"
 msgstr ""
 
+#: include/enotify.php:43 include/delivery.php:457
+msgid "noreply"
+msgstr ""
+
 #: include/enotify.php:70
 #, php-format
 msgid "%s <!item_type!>"
@@ -2040,11 +1352,11 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/event.php:448 include/text.php:1130 mod/settings.php:968
+#: include/event.php:448 include/text.php:1130 mod/settings.php:972
 msgid "Sunday"
 msgstr ""
 
-#: include/event.php:449 include/text.php:1130 mod/settings.php:968
+#: include/event.php:449 include/text.php:1130 mod/settings.php:972
 msgid "Monday"
 msgstr ""
 
@@ -2255,6 +1567,875 @@ msgstr ""
 msgid "following"
 msgstr ""
 
+#: include/nav.php:35 mod/navigation.php:19
+msgid "Nothing new here"
+msgstr ""
+
+#: include/nav.php:39 mod/navigation.php:23
+msgid "Clear notifications"
+msgstr ""
+
+#: include/nav.php:40 include/text.php:1015
+msgid "@name, !forum, #tags, content"
+msgstr ""
+
+#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1787
+msgid "Logout"
+msgstr ""
+
+#: include/nav.php:78 view/theme/frio/theme.php:243
+msgid "End this session"
+msgstr ""
+
+#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637
+#: mod/contacts.php:833 view/theme/frio/theme.php:246
+msgid "Status"
+msgstr ""
+
+#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
+msgid "Your posts and conversations"
+msgstr ""
+
+#: include/nav.php:82 include/identity.php:605 include/identity.php:691
+#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32
+#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
+msgid "Profile"
+msgstr ""
+
+#: include/nav.php:82 view/theme/frio/theme.php:247
+msgid "Your profile page"
+msgstr ""
+
+#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32
+#: view/theme/frio/theme.php:248
+msgid "Photos"
+msgstr ""
+
+#: include/nav.php:83 view/theme/frio/theme.php:248
+msgid "Your photos"
+msgstr ""
+
+#: include/nav.php:84 include/identity.php:738 include/identity.php:741
+#: view/theme/frio/theme.php:249
+msgid "Videos"
+msgstr ""
+
+#: include/nav.php:84 view/theme/frio/theme.php:249
+msgid "Your videos"
+msgstr ""
+
+#: include/nav.php:85 include/nav.php:149 include/identity.php:750
+#: include/identity.php:761 mod/cal.php:275 mod/events.php:379
+#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
+msgid "Events"
+msgstr ""
+
+#: include/nav.php:85 view/theme/frio/theme.php:250
+msgid "Your events"
+msgstr ""
+
+#: include/nav.php:86
+msgid "Personal notes"
+msgstr ""
+
+#: include/nav.php:86
+msgid "Your personal notes"
+msgstr ""
+
+#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1788
+msgid "Login"
+msgstr ""
+
+#: include/nav.php:95
+msgid "Sign in"
+msgstr ""
+
+#: include/nav.php:105 include/nav.php:161
+#: include/NotificationsManager.php:174
+msgid "Home"
+msgstr ""
+
+#: include/nav.php:105
+msgid "Home Page"
+msgstr ""
+
+#: include/nav.php:109 mod/register.php:289 boot.php:1763
+msgid "Register"
+msgstr ""
+
+#: include/nav.php:109
+msgid "Create an account"
+msgstr ""
+
+#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
+msgid "Help"
+msgstr ""
+
+#: include/nav.php:115
+msgid "Help and documentation"
+msgstr ""
+
+#: include/nav.php:119
+msgid "Apps"
+msgstr ""
+
+#: include/nav.php:119
+msgid "Addon applications, utilities, games"
+msgstr ""
+
+#: include/nav.php:123 include/text.php:1012 mod/search.php:149
+msgid "Search"
+msgstr ""
+
+#: include/nav.php:123
+msgid "Search site content"
+msgstr ""
+
+#: include/nav.php:126 include/text.php:1020
+msgid "Full Text"
+msgstr ""
+
+#: include/nav.php:127 include/text.php:1021
+msgid "Tags"
+msgstr ""
+
+#: include/nav.php:128 include/nav.php:192 include/identity.php:783
+#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792
+#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
+msgid "Contacts"
+msgstr ""
+
+#: include/nav.php:143 include/nav.php:145 mod/community.php:36
+msgid "Community"
+msgstr ""
+
+#: include/nav.php:143
+msgid "Conversations on this site"
+msgstr ""
+
+#: include/nav.php:145
+msgid "Conversations on the network"
+msgstr ""
+
+#: include/nav.php:149 include/identity.php:753 include/identity.php:764
+#: view/theme/frio/theme.php:254
+msgid "Events and Calendar"
+msgstr ""
+
+#: include/nav.php:152
+msgid "Directory"
+msgstr ""
+
+#: include/nav.php:152
+msgid "People directory"
+msgstr ""
+
+#: include/nav.php:154
+msgid "Information"
+msgstr ""
+
+#: include/nav.php:154
+msgid "Information about this friendica instance"
+msgstr ""
+
+#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411
+#: view/theme/frio/theme.php:253
+msgid "Network"
+msgstr ""
+
+#: include/nav.php:158 view/theme/frio/theme.php:253
+msgid "Conversations from your friends"
+msgstr ""
+
+#: include/nav.php:159
+msgid "Network Reset"
+msgstr ""
+
+#: include/nav.php:159
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: include/nav.php:166 include/NotificationsManager.php:181
+msgid "Introductions"
+msgstr ""
+
+#: include/nav.php:166
+msgid "Friend Requests"
+msgstr ""
+
+#: include/nav.php:169 mod/notifications.php:96
+msgid "Notifications"
+msgstr ""
+
+#: include/nav.php:170
+msgid "See all notifications"
+msgstr ""
+
+#: include/nav.php:171 mod/settings.php:902
+msgid "Mark as seen"
+msgstr ""
+
+#: include/nav.php:171
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
+msgid "Messages"
+msgstr ""
+
+#: include/nav.php:175 view/theme/frio/theme.php:255
+msgid "Private mail"
+msgstr ""
+
+#: include/nav.php:176
+msgid "Inbox"
+msgstr ""
+
+#: include/nav.php:177
+msgid "Outbox"
+msgstr ""
+
+#: include/nav.php:178 mod/message.php:16
+msgid "New Message"
+msgstr ""
+
+#: include/nav.php:181
+msgid "Manage"
+msgstr ""
+
+#: include/nav.php:181
+msgid "Manage other pages"
+msgstr ""
+
+#: include/nav.php:184 mod/settings.php:81
+msgid "Delegations"
+msgstr ""
+
+#: include/nav.php:184 mod/delegate.php:130
+msgid "Delegate Page Management"
+msgstr ""
+
+#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1520
+#: mod/admin.php:1778 mod/settings.php:111 view/theme/frio/theme.php:256
+msgid "Settings"
+msgstr ""
+
+#: include/nav.php:186 view/theme/frio/theme.php:256
+msgid "Account settings"
+msgstr ""
+
+#: include/nav.php:189 include/identity.php:282
+msgid "Profiles"
+msgstr ""
+
+#: include/nav.php:189
+msgid "Manage/Edit Profiles"
+msgstr ""
+
+#: include/nav.php:192 view/theme/frio/theme.php:257
+msgid "Manage/edit friends and contacts"
+msgstr ""
+
+#: include/nav.php:197 mod/admin.php:186
+msgid "Admin"
+msgstr ""
+
+#: include/nav.php:197
+msgid "Site setup and configuration"
+msgstr ""
+
+#: include/nav.php:200
+msgid "Navigation"
+msgstr ""
+
+#: include/nav.php:200
+msgid "Site map"
+msgstr ""
+
+#: include/oembed.php:252
+msgid "Embedded content"
+msgstr ""
+
+#: include/oembed.php:260
+msgid "Embedding disabled"
+msgstr ""
+
+#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
+#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
+#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
+msgid "Contact Photos"
+msgstr ""
+
+#: include/security.php:22
+msgid "Welcome "
+msgstr ""
+
+#: include/security.php:23
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: include/security.php:26
+msgid "Welcome back "
+msgstr ""
+
+#: include/security.php:373
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr ""
+
+#: include/Contact.php:361 include/Contact.php:374 include/Contact.php:419
+#: include/conversation.php:968 include/conversation.php:984
+#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
+#: mod/match.php:71 mod/suggest.php:82
+msgid "View Profile"
+msgstr ""
+
+#: include/Contact.php:418 include/conversation.php:967
+msgid "View Status"
+msgstr ""
+
+#: include/Contact.php:420 include/conversation.php:969
+msgid "View Photos"
+msgstr ""
+
+#: include/Contact.php:421 include/conversation.php:970
+msgid "Network Posts"
+msgstr ""
+
+#: include/Contact.php:422 include/conversation.php:971
+msgid "View Contact"
+msgstr ""
+
+#: include/Contact.php:423
+msgid "Drop Contact"
+msgstr ""
+
+#: include/Contact.php:424 include/conversation.php:972
+msgid "Send PM"
+msgstr ""
+
+#: include/Contact.php:425 include/conversation.php:976
+msgid "Poke"
+msgstr ""
+
+#: include/Contact.php:798
+msgid "Organisation"
+msgstr ""
+
+#: include/Contact.php:801
+msgid "News"
+msgstr ""
+
+#: include/Contact.php:804
+msgid "Forum"
+msgstr ""
+
+#: include/NotificationsManager.php:153
+msgid "System"
+msgstr ""
+
+#: include/NotificationsManager.php:167 mod/profiles.php:703
+#: mod/network.php:846
+msgid "Personal"
+msgstr ""
+
+#: include/NotificationsManager.php:234 include/NotificationsManager.php:244
+#, php-format
+msgid "%s commented on %s's post"
+msgstr ""
+
+#: include/NotificationsManager.php:243
+#, php-format
+msgid "%s created a new post"
+msgstr ""
+
+#: include/NotificationsManager.php:256
+#, php-format
+msgid "%s liked %s's post"
+msgstr ""
+
+#: include/NotificationsManager.php:267
+#, php-format
+msgid "%s disliked %s's post"
+msgstr ""
+
+#: include/NotificationsManager.php:278
+#, php-format
+msgid "%s is attending %s's event"
+msgstr ""
+
+#: include/NotificationsManager.php:289
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr ""
+
+#: include/NotificationsManager.php:300
+#, php-format
+msgid "%s may attend %s's event"
+msgstr ""
+
+#: include/NotificationsManager.php:315
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: include/NotificationsManager.php:748
+msgid "Friend Suggestion"
+msgstr ""
+
+#: include/NotificationsManager.php:781
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: include/NotificationsManager.php:781
+msgid "New Follower"
+msgstr ""
+
+#: include/api.php:1018
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
+msgstr ""
+
+#: include/api.php:1038
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
+msgstr ""
+
+#: include/api.php:1059
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
+msgstr ""
+
+#: include/conversation.php:147
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr ""
+
+#: include/conversation.php:150
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr ""
+
+#: include/conversation.php:153
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr ""
+
+#: include/conversation.php:185 mod/dfrn_confirm.php:473
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr ""
+
+#: include/conversation.php:219
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: include/conversation.php:239 mod/mood.php:62
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr ""
+
+#: include/conversation.php:278 mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr ""
+
+#: include/conversation.php:303
+msgid "post/item"
+msgstr ""
+
+#: include/conversation.php:304
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr ""
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
+#: mod/photos.php:1607
+msgid "Likes"
+msgstr ""
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
+#: mod/photos.php:1607
+msgid "Dislikes"
+msgstr ""
+
+#: include/conversation.php:586 include/conversation.php:1477
+#: mod/content.php:373 mod/photos.php:1608
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Not attending"
+msgstr ""
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Might attend"
+msgstr ""
+
+#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
+#: mod/photos.php:1681 object/Item.php:133
+msgid "Select"
+msgstr ""
+
+#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
+#: mod/content.php:759 mod/contacts.php:808 mod/contacts.php:1016
+#: mod/admin.php:1410 mod/photos.php:1682 mod/settings.php:741
+#: object/Item.php:134
+msgid "Delete"
+msgstr ""
+
+#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
+#: mod/content.php:911 object/Item.php:367 object/Item.php:368
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: include/conversation.php:765 object/Item.php:355
+msgid "Categories:"
+msgstr ""
+
+#: include/conversation.php:766 object/Item.php:356
+msgid "Filed under:"
+msgstr ""
+
+#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
+#: object/Item.php:381
+#, php-format
+msgid "%s from %s"
+msgstr ""
+
+#: include/conversation.php:789 mod/content.php:513
+msgid "View in context"
+msgstr ""
+
+#: include/conversation.php:791 include/conversation.php:1261
+#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
+#: mod/message.php:548 mod/content.php:515 mod/content.php:948
+#: mod/photos.php:1570 object/Item.php:406
+msgid "Please wait"
+msgstr ""
+
+#: include/conversation.php:870
+msgid "remove"
+msgstr ""
+
+#: include/conversation.php:874
+msgid "Delete Selected Items"
+msgstr ""
+
+#: include/conversation.php:966
+msgid "Follow Thread"
+msgstr ""
+
+#: include/conversation.php:1094
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: include/conversation.php:1097
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: include/conversation.php:1100
+#, php-format
+msgid "%s attends."
+msgstr ""
+
+#: include/conversation.php:1103
+#, php-format
+msgid "%s doesn't attend."
+msgstr ""
+
+#: include/conversation.php:1106
+#, php-format
+msgid "%s attends maybe."
+msgstr ""
+
+#: include/conversation.php:1116
+msgid "and"
+msgstr ""
+
+#: include/conversation.php:1122
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: include/conversation.php:1131
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr ""
+
+#: include/conversation.php:1132
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: include/conversation.php:1135
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr ""
+
+#: include/conversation.php:1136
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: include/conversation.php:1139
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr ""
+
+#: include/conversation.php:1140
+#, php-format
+msgid "%s attend."
+msgstr ""
+
+#: include/conversation.php:1143
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr ""
+
+#: include/conversation.php:1144
+#, php-format
+msgid "%s don't attend."
+msgstr ""
+
+#: include/conversation.php:1147
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr ""
+
+#: include/conversation.php:1148
+#, php-format
+msgid "%s anttend maybe."
+msgstr ""
+
+#: include/conversation.php:1187 include/conversation.php:1205
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: include/conversation.php:1188 include/conversation.php:1206
+#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
+#: mod/message.php:299 mod/message.php:442 mod/message.php:450
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: include/conversation.php:1189 include/conversation.php:1207
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: include/conversation.php:1190 include/conversation.php:1208
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: include/conversation.php:1191 include/conversation.php:1209
+msgid "Tag term:"
+msgstr ""
+
+#: include/conversation.php:1192 include/conversation.php:1210
+#: mod/filer.php:30
+msgid "Save to Folder:"
+msgstr ""
+
+#: include/conversation.php:1193 include/conversation.php:1211
+msgid "Where are you right now?"
+msgstr ""
+
+#: include/conversation.php:1194
+msgid "Delete item(s)?"
+msgstr ""
+
+#: include/conversation.php:1242 mod/photos.php:1569
+msgid "Share"
+msgstr ""
+
+#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
+#: mod/message.php:354 mod/message.php:545
+msgid "Upload photo"
+msgstr ""
+
+#: include/conversation.php:1244 mod/editpost.php:111
+msgid "upload photo"
+msgstr ""
+
+#: include/conversation.php:1245 mod/editpost.php:112
+msgid "Attach file"
+msgstr ""
+
+#: include/conversation.php:1246 mod/editpost.php:113
+msgid "attach file"
+msgstr ""
+
+#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
+#: mod/message.php:355 mod/message.php:546
+msgid "Insert web link"
+msgstr ""
+
+#: include/conversation.php:1248 mod/editpost.php:115
+msgid "web link"
+msgstr ""
+
+#: include/conversation.php:1249 mod/editpost.php:116
+msgid "Insert video link"
+msgstr ""
+
+#: include/conversation.php:1250 mod/editpost.php:117
+msgid "video link"
+msgstr ""
+
+#: include/conversation.php:1251 mod/editpost.php:118
+msgid "Insert audio link"
+msgstr ""
+
+#: include/conversation.php:1252 mod/editpost.php:119
+msgid "audio link"
+msgstr ""
+
+#: include/conversation.php:1253 mod/editpost.php:120
+msgid "Set your location"
+msgstr ""
+
+#: include/conversation.php:1254 mod/editpost.php:121
+msgid "set location"
+msgstr ""
+
+#: include/conversation.php:1255 mod/editpost.php:122
+msgid "Clear browser location"
+msgstr ""
+
+#: include/conversation.php:1256 mod/editpost.php:123
+msgid "clear location"
+msgstr ""
+
+#: include/conversation.php:1258 mod/editpost.php:137
+msgid "Set title"
+msgstr ""
+
+#: include/conversation.php:1260 mod/editpost.php:139
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: include/conversation.php:1262 mod/editpost.php:125
+msgid "Permission settings"
+msgstr ""
+
+#: include/conversation.php:1263 mod/editpost.php:154
+msgid "permissions"
+msgstr ""
+
+#: include/conversation.php:1271 mod/editpost.php:134
+msgid "Public post"
+msgstr ""
+
+#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
+#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
+#: mod/photos.php:1725 object/Item.php:729
+msgid "Preview"
+msgstr ""
+
+#: include/conversation.php:1280 include/items.php:1952 mod/fbrowser.php:101
+#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
+#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
+#: mod/contacts.php:445 mod/suggest.php:32 mod/photos.php:235
+#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705
+#: mod/videos.php:128
+msgid "Cancel"
+msgstr ""
+
+#: include/conversation.php:1286
+msgid "Post to Groups"
+msgstr ""
+
+#: include/conversation.php:1287
+msgid "Post to Contacts"
+msgstr ""
+
+#: include/conversation.php:1288
+msgid "Private post"
+msgstr ""
+
+#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
+msgid "Message"
+msgstr ""
+
+#: include/conversation.php:1294 mod/editpost.php:153
+msgid "Browser"
+msgstr ""
+
+#: include/conversation.php:1449
+msgid "View all"
+msgstr ""
+
+#: include/conversation.php:1471
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/conversation.php:1474
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/conversation.php:1480
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/dbstructure.php:26
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
+msgstr ""
+
+#: include/dbstructure.php:31
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr ""
+
+#: include/dbstructure.php:183
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: include/dbstructure.php:260
+msgid "Errors encountered performing database changes."
+msgstr ""
+
+#: include/delivery.php:446
+msgid "(no subject)"
+msgstr ""
+
+#: include/dfrn.php:1107
+#, php-format
+msgid "%s\\'s birthday"
+msgstr ""
+
+#: include/diaspora.php:1958
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: include/diaspora.php:2864
+msgid "Attachments:"
+msgstr ""
+
 #: include/identity.php:42
 msgid "Requested account is not available."
 msgstr ""
@@ -2271,10 +2452,6 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: include/identity.php:282 include/nav.php:189
-msgid "Profiles"
-msgstr ""
-
 #: include/identity.php:282
 msgid "Manage/edit profiles"
 msgstr ""
@@ -2357,14 +2534,7 @@ msgstr ""
 msgid "Events this week:"
 msgstr ""
 
-#: include/identity.php:605 include/identity.php:691 include/identity.php:722
-#: include/nav.php:82 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Profile"
-msgstr ""
-
-#: include/identity.php:614 mod/settings.php:1274
+#: include/identity.php:614 mod/settings.php:1279
 msgid "Full Name:"
 msgstr ""
 
@@ -2458,16 +2628,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: include/identity.php:693 mod/admin.php:931 mod/contacts.php:870
-#: mod/events.php:508
+#: include/identity.php:693 mod/contacts.php:870 mod/events.php:508
+#: mod/admin.php:956
 msgid "Advanced"
 msgstr ""
 
-#: include/identity.php:714 include/nav.php:81 mod/contacts.php:637
-#: mod/contacts.php:833 view/theme/frio/theme.php:246
-msgid "Status"
-msgstr ""
-
 #: include/identity.php:717 mod/follow.php:143 mod/contacts.php:836
 msgid "Status Messages and Posts"
 msgstr ""
@@ -2476,32 +2641,10 @@ msgstr ""
 msgid "Profile Details"
 msgstr ""
 
-#: include/identity.php:730 include/nav.php:83 mod/fbrowser.php:32
-#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126
-msgid "Photos"
-msgstr ""
-
 #: include/identity.php:733 mod/photos.php:87
 msgid "Photo Albums"
 msgstr ""
 
-#: include/identity.php:738 include/identity.php:741 include/nav.php:84
-#: view/theme/frio/theme.php:249
-msgid "Videos"
-msgstr ""
-
-#: include/identity.php:750 include/identity.php:761 include/nav.php:85
-#: include/nav.php:149 mod/cal.php:275 mod/events.php:379
-#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
-#: view/theme/diabook/theme.php:127
-msgid "Events"
-msgstr ""
-
-#: include/identity.php:753 include/identity.php:764 include/nav.php:149
-#: view/theme/frio/theme.php:254
-msgid "Events and Calendar"
-msgstr ""
-
 #: include/identity.php:772 mod/notes.php:46
 msgid "Personal Notes"
 msgstr ""
@@ -2510,41 +2653,33 @@ msgstr ""
 msgid "Only You Can See This"
 msgstr ""
 
-#: include/identity.php:783 include/identity.php:786 include/nav.php:128
-#: include/nav.php:192 include/text.php:1022 mod/contacts.php:792
-#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
-#: view/theme/diabook/theme.php:125
-msgid "Contacts"
-msgstr ""
-
-#: include/items.php:1518 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
+#: include/items.php:1553 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
 msgid "[Name Withheld]"
 msgstr ""
 
-#: include/items.php:1873 mod/viewsrc.php:15 mod/notice.php:15
-#: mod/admin.php:234 mod/admin.php:1441 mod/admin.php:1675 mod/display.php:103
-#: mod/display.php:279 mod/display.php:478
+#: include/items.php:1908 mod/viewsrc.php:15 mod/notice.php:15
+#: mod/display.php:103 mod/display.php:279 mod/display.php:478
+#: mod/admin.php:234 mod/admin.php:1467 mod/admin.php:1701
 msgid "Item not found."
 msgstr ""
 
-#: include/items.php:1912
+#: include/items.php:1947
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/items.php:1914 mod/follow.php:110 mod/api.php:105
+#: include/items.php:1949 mod/follow.php:110 mod/api.php:105
 #: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
 #: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
-#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158
-#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176
-#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193
-#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226
-#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229
+#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163
+#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
+#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
+#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
+#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
 msgid "Yes"
 msgstr ""
 
-#: include/items.php:2077 mod/wall_upload.php:77 mod/wall_upload.php:80
-#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15
-#: mod/invite.php:101 mod/wall_attach.php:67 mod/wall_attach.php:70
+#: include/items.php:2112 mod/notes.php:22 mod/uimport.php:23
+#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101
 #: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33
 #: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/editpost.php:10
 #: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33
@@ -2557,283 +2692,21 @@ msgstr ""
 #: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605
 #: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18
 #: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
-#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
-#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22
-#: mod/settings.php:128 mod/settings.php:663 index.php:397
+#: mod/events.php:190 mod/suggest.php:58 mod/item.php:198 mod/item.php:210
+#: mod/network.php:4 mod/photos.php:159 mod/photos.php:1072
+#: mod/register.php:42 mod/settings.php:22 mod/settings.php:128
+#: mod/settings.php:665 mod/viewcontacts.php:45 mod/wall_attach.php:67
+#: mod/wall_attach.php:70 mod/wall_upload.php:77 mod/wall_upload.php:80
+#: index.php:397
 msgid "Permission denied."
 msgstr ""
 
-#: include/items.php:2182
+#: include/items.php:2217
 msgid "Archives"
 msgstr ""
 
-#: include/nav.php:35 mod/navigation.php:19
-msgid "Nothing new here"
-msgstr ""
-
-#: include/nav.php:39 mod/navigation.php:23
-msgid "Clear notifications"
-msgstr ""
-
-#: include/nav.php:40 include/text.php:1015
-msgid "@name, !forum, #tags, content"
-msgstr ""
-
-#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1778
-msgid "Logout"
-msgstr ""
-
-#: include/nav.php:78 view/theme/frio/theme.php:243
-msgid "End this session"
-msgstr ""
-
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
-#: view/theme/diabook/theme.php:123
-msgid "Your posts and conversations"
-msgstr ""
-
-#: include/nav.php:82 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Your profile page"
-msgstr ""
-
-#: include/nav.php:83 view/theme/frio/theme.php:248
-#: view/theme/diabook/theme.php:126
-msgid "Your photos"
-msgstr ""
-
-#: include/nav.php:84 view/theme/frio/theme.php:249
-msgid "Your videos"
-msgstr ""
-
-#: include/nav.php:85 view/theme/frio/theme.php:250
-#: view/theme/diabook/theme.php:127
-msgid "Your events"
-msgstr ""
-
-#: include/nav.php:86 view/theme/diabook/theme.php:128
-msgid "Personal notes"
-msgstr ""
-
-#: include/nav.php:86
-msgid "Your personal notes"
-msgstr ""
-
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1779
-msgid "Login"
-msgstr ""
-
-#: include/nav.php:95
-msgid "Sign in"
-msgstr ""
-
-#: include/nav.php:105
-msgid "Home Page"
-msgstr ""
-
-#: include/nav.php:109 mod/register.php:280 boot.php:1754
-msgid "Register"
-msgstr ""
-
-#: include/nav.php:109
-msgid "Create an account"
-msgstr ""
-
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
-msgid "Help"
-msgstr ""
-
-#: include/nav.php:115
-msgid "Help and documentation"
-msgstr ""
-
-#: include/nav.php:119
-msgid "Apps"
-msgstr ""
-
-#: include/nav.php:119
-msgid "Addon applications, utilities, games"
-msgstr ""
-
-#: include/nav.php:123 include/text.php:1012 mod/search.php:149
-msgid "Search"
-msgstr ""
-
-#: include/nav.php:123
-msgid "Search site content"
-msgstr ""
-
-#: include/nav.php:126 include/text.php:1020
-msgid "Full Text"
-msgstr ""
-
-#: include/nav.php:127 include/text.php:1021
-msgid "Tags"
-msgstr ""
-
-#: include/nav.php:143 include/nav.php:145 mod/community.php:36
-#: view/theme/diabook/theme.php:129
-msgid "Community"
-msgstr ""
-
-#: include/nav.php:143
-msgid "Conversations on this site"
-msgstr ""
-
-#: include/nav.php:145
-msgid "Conversations on the network"
-msgstr ""
-
-#: include/nav.php:152
-msgid "Directory"
-msgstr ""
-
-#: include/nav.php:152
-msgid "People directory"
-msgstr ""
-
-#: include/nav.php:154
-msgid "Information"
-msgstr ""
-
-#: include/nav.php:154
-msgid "Information about this friendica instance"
-msgstr ""
-
-#: include/nav.php:158 view/theme/frio/theme.php:253
-msgid "Conversations from your friends"
-msgstr ""
-
-#: include/nav.php:159
-msgid "Network Reset"
-msgstr ""
-
-#: include/nav.php:159
-msgid "Load Network page with no filters"
-msgstr ""
-
-#: include/nav.php:166
-msgid "Friend Requests"
-msgstr ""
-
-#: include/nav.php:169 mod/notifications.php:96
-msgid "Notifications"
-msgstr ""
-
-#: include/nav.php:170
-msgid "See all notifications"
-msgstr ""
-
-#: include/nav.php:171 mod/settings.php:900
-msgid "Mark as seen"
-msgstr ""
-
-#: include/nav.php:171
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
-msgid "Messages"
-msgstr ""
-
-#: include/nav.php:175 view/theme/frio/theme.php:255
-msgid "Private mail"
-msgstr ""
-
-#: include/nav.php:176
-msgid "Inbox"
-msgstr ""
-
-#: include/nav.php:177
-msgid "Outbox"
-msgstr ""
-
-#: include/nav.php:178 mod/message.php:16
-msgid "New Message"
-msgstr ""
-
-#: include/nav.php:181
-msgid "Manage"
-msgstr ""
-
-#: include/nav.php:181
-msgid "Manage other pages"
-msgstr ""
-
-#: include/nav.php:184 mod/settings.php:81
-msgid "Delegations"
-msgstr ""
-
-#: include/nav.php:184 mod/delegate.php:130
-msgid "Delegate Page Management"
-msgstr ""
-
-#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1494
-#: mod/admin.php:1752 mod/settings.php:111 view/theme/frio/theme.php:256
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648
-msgid "Settings"
-msgstr ""
-
-#: include/nav.php:186 view/theme/frio/theme.php:256
-msgid "Account settings"
-msgstr ""
-
-#: include/nav.php:189
-msgid "Manage/Edit Profiles"
-msgstr ""
-
-#: include/nav.php:192 view/theme/frio/theme.php:257
-msgid "Manage/edit friends and contacts"
-msgstr ""
-
-#: include/nav.php:197 mod/admin.php:186
-msgid "Admin"
-msgstr ""
-
-#: include/nav.php:197
-msgid "Site setup and configuration"
-msgstr ""
-
-#: include/nav.php:200
-msgid "Navigation"
-msgstr ""
-
-#: include/nav.php:200
-msgid "Site map"
-msgstr ""
-
-#: include/oembed.php:252
-msgid "Embedded content"
-msgstr ""
-
-#: include/oembed.php:260
-msgid "Embedding disabled"
-msgstr ""
-
-#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
-#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
-#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
-#: view/theme/diabook/theme.php:499
-msgid "Contact Photos"
-msgstr ""
-
-#: include/security.php:22
-msgid "Welcome "
-msgstr ""
-
-#: include/security.php:23
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: include/security.php:26
-msgid "Welcome back "
-msgstr ""
-
-#: include/security.php:373
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: include/network.php:595
+msgid "view full size"
 msgstr ""
 
 #: include/text.php:304
@@ -3055,24 +2928,151 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: include/Contact.php:119
-msgid "stopped following"
+#: include/user.php:39 mod/settings.php:373
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: include/Contact.php:395
-msgid "Drop Contact"
+#: include/user.php:48
+msgid "An invitation is required."
 msgstr ""
 
-#: include/Contact.php:770
-msgid "Organisation"
+#: include/user.php:53
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: include/Contact.php:773
-msgid "News"
+#: include/user.php:61
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: include/Contact.php:776
-msgid "Forum"
+#: include/user.php:82
+msgid "Please enter the required information."
+msgstr ""
+
+#: include/user.php:96
+msgid "Please use a shorter name."
+msgstr ""
+
+#: include/user.php:98
+msgid "Name too short."
+msgstr ""
+
+#: include/user.php:113
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr ""
+
+#: include/user.php:118
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: include/user.php:121
+msgid "Not a valid email address."
+msgstr ""
+
+#: include/user.php:134
+msgid "Cannot use that email."
+msgstr ""
+
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+msgstr ""
+
+#: include/user.php:147 include/user.php:245
+msgid "Nickname is already registered. Please choose another."
+msgstr ""
+
+#: include/user.php:157
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: include/user.php:173
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr ""
+
+#: include/user.php:231
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+
+#: include/user.php:256 view/theme/duepuntozero/config.php:44
+msgid "default"
+msgstr ""
+
+#: include/user.php:266
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: include/user.php:345 include/user.php:352 include/user.php:359
+#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
+#: mod/profile_photo.php:210 mod/profile_photo.php:302
+#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
+#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
+#: mod/photos.php:1819
+msgid "Profile Photos"
+msgstr ""
+
+#: include/user.php:390
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account is pending for "
+"approval by the administrator.\n"
+"\t"
+msgstr ""
+
+#: include/user.php:400
+#, php-format
+msgid "Registration at %s"
+msgstr ""
+
+#: include/user.php:410
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
+msgstr ""
+
+#: include/user.php:414
+#, php-format
+msgid ""
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$s\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\tthan that.\n"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
+msgstr ""
+
+#: include/user.php:446 mod/admin.php:1209
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
 #: mod/oexchange.php:25
@@ -3222,7 +3222,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: mod/lostpass.php:109 boot.php:1793
+#: mod/lostpass.php:109 boot.php:1802
 msgid "Password Reset"
 msgstr ""
 
@@ -3290,7 +3290,7 @@ msgid ""
 "your email for further instructions."
 msgstr ""
 
-#: mod/lostpass.php:161 boot.php:1781
+#: mod/lostpass.php:161 boot.php:1790
 msgid "Nickname or Email: "
 msgstr ""
 
@@ -3315,25 +3315,6 @@ msgstr ""
 msgid "Page not found."
 msgstr ""
 
-#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
-#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
-#: mod/wall_attach.php:25 mod/wall_attach.php:76
-msgid "Invalid request."
-msgstr ""
-
-#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:786
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
-
-#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:826
-msgid "Unable to process image."
-msgstr ""
-
-#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:853
-msgid "Image upload failed."
-msgstr ""
-
 #: mod/lockview.php:31 mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr ""
@@ -3351,13 +3332,13 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: mod/uimport.php:50 mod/register.php:191
+#: mod/uimport.php:50 mod/register.php:198
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: mod/uimport.php:64 mod/register.php:286
+#: mod/uimport.php:64 mod/register.php:295
 msgid "Import"
 msgstr ""
 
@@ -3535,10 +3516,8 @@ msgstr ""
 #: mod/install.php:272 mod/install.php:312 mod/photos.php:1104
 #: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590
 #: mod/photos.php:1638 mod/photos.php:1724 object/Item.php:720
-#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80
-#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70
-#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633
-#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59
+#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64
+#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
 msgid "Submit"
 msgstr ""
 
@@ -3586,23 +3565,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: mod/wall_attach.php:94
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr ""
-
-#: mod/wall_attach.php:94
-msgid "Or - did you try to upload an empty file?"
-msgstr ""
-
-#: mod/wall_attach.php:105
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr ""
-
-#: mod/wall_attach.php:156 mod/wall_attach.php:172
-msgid "File upload failed."
-msgstr ""
-
 #: mod/repair_ostatus.php:14
 msgid "Resubscribing to OStatus contacts"
 msgstr ""
@@ -3709,11 +3671,11 @@ msgstr ""
 
 #: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861
 #: mod/profiles.php:648 mod/profiles.php:652 mod/profiles.php:677
-#: mod/register.php:239 mod/settings.php:1158 mod/settings.php:1164
-#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181
-#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199
-#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227
-#: mod/settings.php:1228 mod/settings.php:1229
+#: mod/register.php:246 mod/settings.php:1163 mod/settings.php:1169
+#: mod/settings.php:1177 mod/settings.php:1181 mod/settings.php:1186
+#: mod/settings.php:1192 mod/settings.php:1198 mod/settings.php:1204
+#: mod/settings.php:1230 mod/settings.php:1231 mod/settings.php:1232
+#: mod/settings.php:1233 mod/settings.php:1234
 msgid "No"
 msgstr ""
 
@@ -4017,7 +3979,7 @@ msgstr ""
 msgid "All Contacts"
 msgstr ""
 
-#: mod/group.php:193 mod/content.php:130 mod/network.php:495
+#: mod/group.php:193 mod/content.php:130 mod/network.php:496
 msgid "Group is empty"
 msgstr ""
 
@@ -4313,9 +4275,9 @@ msgid ""
 "entries from this contact."
 msgstr ""
 
-#: mod/crepair.php:165 mod/admin.php:1367 mod/admin.php:1380
-#: mod/admin.php:1392 mod/admin.php:1408 mod/settings.php:678
-#: mod/settings.php:704
+#: mod/crepair.php:165 mod/admin.php:1392 mod/admin.php:1405
+#: mod/admin.php:1418 mod/admin.php:1434 mod/settings.php:680
+#: mod/settings.php:706
 msgid "Name"
 msgstr ""
 
@@ -4500,11 +4462,11 @@ msgid ""
 "bar."
 msgstr ""
 
-#: mod/content.php:119 mod/network.php:468
+#: mod/content.php:119 mod/network.php:469
 msgid "No such group"
 msgstr ""
 
-#: mod/content.php:135 mod/network.php:499
+#: mod/content.php:135 mod/network.php:500
 #, php-format
 msgid "Group: %s"
 msgstr ""
@@ -4555,7 +4517,7 @@ msgstr ""
 
 #: mod/content.php:727 mod/content.php:945 mod/photos.php:1589
 #: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403
-#: object/Item.php:719 boot.php:969
+#: object/Item.php:719 boot.php:970
 msgid "Comment"
 msgstr ""
 
@@ -4591,7 +4553,7 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: mod/content.php:746 mod/settings.php:738 object/Item.php:122
+#: mod/content.php:746 mod/settings.php:740 object/Item.php:122
 #: object/Item.php:124
 msgid "Edit"
 msgstr ""
@@ -4797,6 +4759,15 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
+#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr ""
+
+#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188
+msgid "Unable to process image."
+msgstr ""
+
 #: mod/profile_photo.php:248
 msgid "Upload File:"
 msgstr ""
@@ -4837,6 +4808,10 @@ msgstr ""
 msgid "Image uploaded successfully."
 msgstr ""
 
+#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221
+msgid "Image upload failed."
+msgstr ""
+
 #: mod/regmod.php:55
 msgid "Account approved."
 msgstr ""
@@ -4906,7 +4881,7 @@ msgstr ""
 msgid "if applicable"
 msgstr ""
 
-#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1382
+#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1408
 msgid "Approve"
 msgstr ""
 
@@ -5268,1388 +5243,6 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: mod/admin.php:92
-msgid "Theme settings updated."
-msgstr ""
-
-#: mod/admin.php:156 mod/admin.php:926
-msgid "Site"
-msgstr ""
-
-#: mod/admin.php:157 mod/admin.php:870 mod/admin.php:1375 mod/admin.php:1390
-msgid "Users"
-msgstr ""
-
-#: mod/admin.php:158 mod/admin.php:1492 mod/admin.php:1552 mod/settings.php:74
-msgid "Plugins"
-msgstr ""
-
-#: mod/admin.php:159 mod/admin.php:1750 mod/admin.php:1800
-msgid "Themes"
-msgstr ""
-
-#: mod/admin.php:160 mod/settings.php:52
-msgid "Additional features"
-msgstr ""
-
-#: mod/admin.php:161
-msgid "DB updates"
-msgstr ""
-
-#: mod/admin.php:162 mod/admin.php:397
-msgid "Inspect Queue"
-msgstr ""
-
-#: mod/admin.php:163 mod/admin.php:363
-msgid "Federation Statistics"
-msgstr ""
-
-#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1874
-msgid "Logs"
-msgstr ""
-
-#: mod/admin.php:178 mod/admin.php:1942
-msgid "View Logs"
-msgstr ""
-
-#: mod/admin.php:179
-msgid "probe address"
-msgstr ""
-
-#: mod/admin.php:180
-msgid "check webfinger"
-msgstr ""
-
-#: mod/admin.php:187
-msgid "Plugin Features"
-msgstr ""
-
-#: mod/admin.php:189
-msgid "diagnostics"
-msgstr ""
-
-#: mod/admin.php:190
-msgid "User registrations waiting for confirmation"
-msgstr ""
-
-#: mod/admin.php:356
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
-msgstr ""
-
-#: mod/admin.php:357
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr ""
-
-#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:925
-#: mod/admin.php:1374 mod/admin.php:1491 mod/admin.php:1551 mod/admin.php:1749
-#: mod/admin.php:1799 mod/admin.php:1873 mod/admin.php:1941
-msgid "Administration"
-msgstr ""
-
-#: mod/admin.php:369
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
-msgstr ""
-
-#: mod/admin.php:399
-msgid "ID"
-msgstr ""
-
-#: mod/admin.php:400
-msgid "Recipient Name"
-msgstr ""
-
-#: mod/admin.php:401
-msgid "Recipient Profile"
-msgstr ""
-
-#: mod/admin.php:403
-msgid "Created"
-msgstr ""
-
-#: mod/admin.php:404
-msgid "Last Tried"
-msgstr ""
-
-#: mod/admin.php:405
-msgid ""
-"This page lists the content of the queue for outgoing postings. These are "
-"postings the initial delivery failed for. They will be resend later and "
-"eventually deleted if the delivery fails permanently."
-msgstr ""
-
-#: mod/admin.php:424 mod/admin.php:1323
-msgid "Normal Account"
-msgstr ""
-
-#: mod/admin.php:425 mod/admin.php:1324
-msgid "Soapbox Account"
-msgstr ""
-
-#: mod/admin.php:426 mod/admin.php:1325
-msgid "Community/Celebrity Account"
-msgstr ""
-
-#: mod/admin.php:427 mod/admin.php:1326
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: mod/admin.php:428
-msgid "Blog Account"
-msgstr ""
-
-#: mod/admin.php:429
-msgid "Private Forum"
-msgstr ""
-
-#: mod/admin.php:455
-msgid "Message queues"
-msgstr ""
-
-#: mod/admin.php:461
-msgid "Summary"
-msgstr ""
-
-#: mod/admin.php:464
-msgid "Registered users"
-msgstr ""
-
-#: mod/admin.php:466
-msgid "Pending registrations"
-msgstr ""
-
-#: mod/admin.php:467
-msgid "Version"
-msgstr ""
-
-#: mod/admin.php:472
-msgid "Active plugins"
-msgstr ""
-
-#: mod/admin.php:495
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr ""
-
-#: mod/admin.php:798
-msgid "RINO2 needs mcrypt php extension to work."
-msgstr ""
-
-#: mod/admin.php:806
-msgid "Site settings updated."
-msgstr ""
-
-#: mod/admin.php:834 mod/settings.php:932
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:853
-msgid "No community page"
-msgstr ""
-
-#: mod/admin.php:854
-msgid "Public postings from users of this site"
-msgstr ""
-
-#: mod/admin.php:855
-msgid "Global community page"
-msgstr ""
-
-#: mod/admin.php:860 mod/contacts.php:530
-msgid "Never"
-msgstr ""
-
-#: mod/admin.php:861
-msgid "At post arrival"
-msgstr ""
-
-#: mod/admin.php:869 mod/contacts.php:557
-msgid "Disabled"
-msgstr ""
-
-#: mod/admin.php:871
-msgid "Users, Global Contacts"
-msgstr ""
-
-#: mod/admin.php:872
-msgid "Users, Global Contacts/fallback"
-msgstr ""
-
-#: mod/admin.php:876
-msgid "One month"
-msgstr ""
-
-#: mod/admin.php:877
-msgid "Three months"
-msgstr ""
-
-#: mod/admin.php:878
-msgid "Half a year"
-msgstr ""
-
-#: mod/admin.php:879
-msgid "One year"
-msgstr ""
-
-#: mod/admin.php:884
-msgid "Multi user instance"
-msgstr ""
-
-#: mod/admin.php:907
-msgid "Closed"
-msgstr ""
-
-#: mod/admin.php:908
-msgid "Requires approval"
-msgstr ""
-
-#: mod/admin.php:909
-msgid "Open"
-msgstr ""
-
-#: mod/admin.php:913
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: mod/admin.php:914
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: mod/admin.php:915
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: mod/admin.php:927 mod/admin.php:1553 mod/admin.php:1801 mod/admin.php:1875
-#: mod/admin.php:2025 mod/settings.php:676 mod/settings.php:786
-#: mod/settings.php:833 mod/settings.php:902 mod/settings.php:992
-#: mod/settings.php:1259
-msgid "Save Settings"
-msgstr ""
-
-#: mod/admin.php:928 mod/register.php:263
-msgid "Registration"
-msgstr ""
-
-#: mod/admin.php:929
-msgid "File upload"
-msgstr ""
-
-#: mod/admin.php:930
-msgid "Policies"
-msgstr ""
-
-#: mod/admin.php:932
-msgid "Auto Discovered Contact Directory"
-msgstr ""
-
-#: mod/admin.php:933
-msgid "Performance"
-msgstr ""
-
-#: mod/admin.php:934
-msgid "Worker"
-msgstr ""
-
-#: mod/admin.php:935
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr ""
-
-#: mod/admin.php:938
-msgid "Site name"
-msgstr ""
-
-#: mod/admin.php:939
-msgid "Host name"
-msgstr ""
-
-#: mod/admin.php:940
-msgid "Sender Email"
-msgstr ""
-
-#: mod/admin.php:940
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr ""
-
-#: mod/admin.php:941
-msgid "Banner/Logo"
-msgstr ""
-
-#: mod/admin.php:942
-msgid "Shortcut icon"
-msgstr ""
-
-#: mod/admin.php:942
-msgid "Link to an icon that will be used for browsers."
-msgstr ""
-
-#: mod/admin.php:943
-msgid "Touch icon"
-msgstr ""
-
-#: mod/admin.php:943
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr ""
-
-#: mod/admin.php:944
-msgid "Additional Info"
-msgstr ""
-
-#: mod/admin.php:944
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr ""
-
-#: mod/admin.php:945
-msgid "System language"
-msgstr ""
-
-#: mod/admin.php:946
-msgid "System theme"
-msgstr ""
-
-#: mod/admin.php:946
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: mod/admin.php:947
-msgid "Mobile system theme"
-msgstr ""
-
-#: mod/admin.php:947
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:948
-msgid "SSL link policy"
-msgstr ""
-
-#: mod/admin.php:948
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: mod/admin.php:949
-msgid "Force SSL"
-msgstr ""
-
-#: mod/admin.php:949
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
-msgstr ""
-
-#: mod/admin.php:950
-msgid "Old style 'Share'"
-msgstr ""
-
-#: mod/admin.php:950
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr ""
-
-#: mod/admin.php:951
-msgid "Hide help entry from navigation menu"
-msgstr ""
-
-#: mod/admin.php:951
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr ""
-
-#: mod/admin.php:952
-msgid "Single user instance"
-msgstr ""
-
-#: mod/admin.php:952
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr ""
-
-#: mod/admin.php:953
-msgid "Maximum image size"
-msgstr ""
-
-#: mod/admin.php:953
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: mod/admin.php:954
-msgid "Maximum image length"
-msgstr ""
-
-#: mod/admin.php:954
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr ""
-
-#: mod/admin.php:955
-msgid "JPEG image quality"
-msgstr ""
-
-#: mod/admin.php:955
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: mod/admin.php:957
-msgid "Register policy"
-msgstr ""
-
-#: mod/admin.php:958
-msgid "Maximum Daily Registrations"
-msgstr ""
-
-#: mod/admin.php:958
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user "
-"registrations to accept per day.  If register is set to closed, this setting "
-"has no effect."
-msgstr ""
-
-#: mod/admin.php:959
-msgid "Register text"
-msgstr ""
-
-#: mod/admin.php:959
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: mod/admin.php:960
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: mod/admin.php:960
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: mod/admin.php:961
-msgid "Allowed friend domains"
-msgstr ""
-
-#: mod/admin.php:961
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr ""
-
-#: mod/admin.php:962
-msgid "Allowed email domains"
-msgstr ""
-
-#: mod/admin.php:962
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr ""
-
-#: mod/admin.php:963
-msgid "Block public"
-msgstr ""
-
-#: mod/admin.php:963
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr ""
-
-#: mod/admin.php:964
-msgid "Force publish"
-msgstr ""
-
-#: mod/admin.php:964
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: mod/admin.php:965
-msgid "Global directory URL"
-msgstr ""
-
-#: mod/admin.php:965
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr ""
-
-#: mod/admin.php:966
-msgid "Allow threaded items"
-msgstr ""
-
-#: mod/admin.php:966
-msgid "Allow infinite level threading for items on this site."
-msgstr ""
-
-#: mod/admin.php:967
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: mod/admin.php:967
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: mod/admin.php:968
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: mod/admin.php:968
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr ""
-
-#: mod/admin.php:969
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: mod/admin.php:969
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: mod/admin.php:970
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: mod/admin.php:970
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
-msgstr ""
-
-#: mod/admin.php:971
-msgid "Allow Users to set remote_self"
-msgstr ""
-
-#: mod/admin.php:971
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr ""
-
-#: mod/admin.php:972
-msgid "Block multiple registrations"
-msgstr ""
-
-#: mod/admin.php:972
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: mod/admin.php:973
-msgid "OpenID support"
-msgstr ""
-
-#: mod/admin.php:973
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: mod/admin.php:974
-msgid "Fullname check"
-msgstr ""
-
-#: mod/admin.php:974
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: mod/admin.php:975
-msgid "UTF-8 Regular expressions"
-msgstr ""
-
-#: mod/admin.php:975
-msgid "Use PHP UTF8 regular expressions"
-msgstr ""
-
-#: mod/admin.php:976
-msgid "Community Page Style"
-msgstr ""
-
-#: mod/admin.php:976
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr ""
-
-#: mod/admin.php:977
-msgid "Posts per user on community page"
-msgstr ""
-
-#: mod/admin.php:977
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr ""
-
-#: mod/admin.php:978
-msgid "Enable OStatus support"
-msgstr ""
-
-#: mod/admin.php:978
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: mod/admin.php:979
-msgid "OStatus conversation completion interval"
-msgstr ""
-
-#: mod/admin.php:979
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr ""
-
-#: mod/admin.php:980
-msgid "Only import OStatus threads from our contacts"
-msgstr ""
-
-#: mod/admin.php:980
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option "
-"we only store threads that are started by a contact that is known on our "
-"system."
-msgstr ""
-
-#: mod/admin.php:981
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr ""
-
-#: mod/admin.php:983
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
-msgstr ""
-
-#: mod/admin.php:984
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: mod/admin.php:984
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: mod/admin.php:985
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: mod/admin.php:985
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: mod/admin.php:986
-msgid "Verify SSL"
-msgstr ""
-
-#: mod/admin.php:986
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
-msgstr ""
-
-#: mod/admin.php:987
-msgid "Proxy user"
-msgstr ""
-
-#: mod/admin.php:988
-msgid "Proxy URL"
-msgstr ""
-
-#: mod/admin.php:989
-msgid "Network timeout"
-msgstr ""
-
-#: mod/admin.php:989
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: mod/admin.php:990
-msgid "Delivery interval"
-msgstr ""
-
-#: mod/admin.php:990
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
-
-#: mod/admin.php:991
-msgid "Poll interval"
-msgstr ""
-
-#: mod/admin.php:991
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: mod/admin.php:992
-msgid "Maximum Load Average"
-msgstr ""
-
-#: mod/admin.php:992
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: mod/admin.php:993
-msgid "Maximum Load Average (Frontend)"
-msgstr ""
-
-#: mod/admin.php:993
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr ""
-
-#: mod/admin.php:994
-msgid "Maximum table size for optimization"
-msgstr ""
-
-#: mod/admin.php:994
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
-msgstr ""
-
-#: mod/admin.php:995
-msgid "Minimum level of fragmentation"
-msgstr ""
-
-#: mod/admin.php:995
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr ""
-
-#: mod/admin.php:997
-msgid "Periodical check of global contacts"
-msgstr ""
-
-#: mod/admin.php:997
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr ""
-
-#: mod/admin.php:998
-msgid "Days between requery"
-msgstr ""
-
-#: mod/admin.php:998
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr ""
-
-#: mod/admin.php:999
-msgid "Discover contacts from other servers"
-msgstr ""
-
-#: mod/admin.php:999
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
-msgstr ""
-
-#: mod/admin.php:1000
-msgid "Timeframe for fetching global contacts"
-msgstr ""
-
-#: mod/admin.php:1000
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr ""
-
-#: mod/admin.php:1001
-msgid "Search the local directory"
-msgstr ""
-
-#: mod/admin.php:1001
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr ""
-
-#: mod/admin.php:1003
-msgid "Publish server information"
-msgstr ""
-
-#: mod/admin.php:1003
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a "
-"href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr ""
-
-#: mod/admin.php:1005
-msgid "Use MySQL full text engine"
-msgstr ""
-
-#: mod/admin.php:1005
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr ""
-
-#: mod/admin.php:1006
-msgid "Suppress Language"
-msgstr ""
-
-#: mod/admin.php:1006
-msgid "Suppress language information in meta information about a posting."
-msgstr ""
-
-#: mod/admin.php:1007
-msgid "Suppress Tags"
-msgstr ""
-
-#: mod/admin.php:1007
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
-
-#: mod/admin.php:1008
-msgid "Path to item cache"
-msgstr ""
-
-#: mod/admin.php:1008
-msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
-
-#: mod/admin.php:1009
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: mod/admin.php:1009
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One "
-"day). To disable the item cache, set the value to -1."
-msgstr ""
-
-#: mod/admin.php:1010
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: mod/admin.php:1010
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: mod/admin.php:1011
-msgid "Path for lock file"
-msgstr ""
-
-#: mod/admin.php:1011
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr ""
-
-#: mod/admin.php:1012
-msgid "Temp path"
-msgstr ""
-
-#: mod/admin.php:1012
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr ""
-
-#: mod/admin.php:1013
-msgid "Base path to installation"
-msgstr ""
-
-#: mod/admin.php:1013
-msgid ""
-"If the system cannot detect the correct path to your installation, enter the "
-"correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
-msgstr ""
-
-#: mod/admin.php:1014
-msgid "Disable picture proxy"
-msgstr ""
-
-#: mod/admin.php:1014
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
-msgstr ""
-
-#: mod/admin.php:1015
-msgid "Enable old style pager"
-msgstr ""
-
-#: mod/admin.php:1015
-msgid ""
-"The old style pager has page numbers but slows down massively the page speed."
-msgstr ""
-
-#: mod/admin.php:1016
-msgid "Only search in tags"
-msgstr ""
-
-#: mod/admin.php:1016
-msgid "On large systems the text search can slow down the system extremely."
-msgstr ""
-
-#: mod/admin.php:1018
-msgid "New base url"
-msgstr ""
-
-#: mod/admin.php:1018
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts "
-"of all users."
-msgstr ""
-
-#: mod/admin.php:1020
-msgid "RINO Encryption"
-msgstr ""
-
-#: mod/admin.php:1020
-msgid "Encryption layer between nodes."
-msgstr ""
-
-#: mod/admin.php:1021
-msgid "Embedly API key"
-msgstr ""
-
-#: mod/admin.php:1021
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr ""
-
-#: mod/admin.php:1023
-msgid "Enable 'worker' background processing"
-msgstr ""
-
-#: mod/admin.php:1023
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
-msgstr ""
-
-#: mod/admin.php:1024
-msgid "Maximum number of parallel workers"
-msgstr ""
-
-#: mod/admin.php:1024
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr ""
-
-#: mod/admin.php:1025
-msgid "Don't use 'proc_open' with the worker"
-msgstr ""
-
-#: mod/admin.php:1025
-msgid ""
-"Enable this if your system doesn't allow the use of 'proc_open'. This can "
-"happen on shared hosters. If this is enabled you should increase the "
-"frequency of poller calls in your crontab."
-msgstr ""
-
-#: mod/admin.php:1026
-msgid "Enable fastlane"
-msgstr ""
-
-#: mod/admin.php:1026
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes "
-"with higher priority are blocked by processes of lower priority."
-msgstr ""
-
-#: mod/admin.php:1055
-msgid "Update has been marked successful"
-msgstr ""
-
-#: mod/admin.php:1063
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:1066
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1078
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1081
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:1085
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: mod/admin.php:1087
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr ""
-
-#: mod/admin.php:1106
-msgid "No failed updates."
-msgstr ""
-
-#: mod/admin.php:1107
-msgid "Check database structure"
-msgstr ""
-
-#: mod/admin.php:1112
-msgid "Failed Updates"
-msgstr ""
-
-#: mod/admin.php:1113
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: mod/admin.php:1114
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: mod/admin.php:1115
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: mod/admin.php:1149
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr ""
-
-#: mod/admin.php:1152
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after "
-"logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that "
-"page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default "
-"profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
-"and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more "
-"specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are "
-"necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr ""
-
-#: mod/admin.php:1196
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:1203
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:1250
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Register date"
-msgstr ""
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last login"
-msgstr ""
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last item"
-msgstr ""
-
-#: mod/admin.php:1367 mod/settings.php:43
-msgid "Account"
-msgstr ""
-
-#: mod/admin.php:1376
-msgid "Add User"
-msgstr ""
-
-#: mod/admin.php:1377
-msgid "select all"
-msgstr ""
-
-#: mod/admin.php:1378
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: mod/admin.php:1379
-msgid "User waiting for permanent deletion"
-msgstr ""
-
-#: mod/admin.php:1380
-msgid "Request date"
-msgstr ""
-
-#: mod/admin.php:1381
-msgid "No registrations."
-msgstr ""
-
-#: mod/admin.php:1383
-msgid "Deny"
-msgstr ""
-
-#: mod/admin.php:1385 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Block"
-msgstr ""
-
-#: mod/admin.php:1386 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Unblock"
-msgstr ""
-
-#: mod/admin.php:1387
-msgid "Site admin"
-msgstr ""
-
-#: mod/admin.php:1388
-msgid "Account expired"
-msgstr ""
-
-#: mod/admin.php:1391
-msgid "New User"
-msgstr ""
-
-#: mod/admin.php:1392
-msgid "Deleted since"
-msgstr ""
-
-#: mod/admin.php:1397
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1398
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1408
-msgid "Name of the new user."
-msgstr ""
-
-#: mod/admin.php:1409
-msgid "Nickname"
-msgstr ""
-
-#: mod/admin.php:1409
-msgid "Nickname of the new user."
-msgstr ""
-
-#: mod/admin.php:1410
-msgid "Email address of the new user."
-msgstr ""
-
-#: mod/admin.php:1453
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: mod/admin.php:1457
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: mod/admin.php:1468 mod/admin.php:1704
-msgid "Disable"
-msgstr ""
-
-#: mod/admin.php:1470 mod/admin.php:1706
-msgid "Enable"
-msgstr ""
-
-#: mod/admin.php:1493 mod/admin.php:1751
-msgid "Toggle"
-msgstr ""
-
-#: mod/admin.php:1501 mod/admin.php:1760
-msgid "Author: "
-msgstr ""
-
-#: mod/admin.php:1502 mod/admin.php:1761
-msgid "Maintainer: "
-msgstr ""
-
-#: mod/admin.php:1554
-msgid "Reload active plugins"
-msgstr ""
-
-#: mod/admin.php:1559
-#, php-format
-msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
-msgstr ""
-
-#: mod/admin.php:1664
-msgid "No themes found."
-msgstr ""
-
-#: mod/admin.php:1742
-msgid "Screenshot"
-msgstr ""
-
-#: mod/admin.php:1802
-msgid "Reload active themes"
-msgstr ""
-
-#: mod/admin.php:1807
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
-msgstr ""
-
-#: mod/admin.php:1808
-msgid "[Experimental]"
-msgstr ""
-
-#: mod/admin.php:1809
-msgid "[Unsupported]"
-msgstr ""
-
-#: mod/admin.php:1833
-msgid "Log settings updated."
-msgstr ""
-
-#: mod/admin.php:1865
-msgid "PHP log currently enabled."
-msgstr ""
-
-#: mod/admin.php:1867
-msgid "PHP log currently disabled."
-msgstr ""
-
-#: mod/admin.php:1876
-msgid "Clear"
-msgstr ""
-
-#: mod/admin.php:1881
-msgid "Enable Debugging"
-msgstr ""
-
-#: mod/admin.php:1882
-msgid "Log file"
-msgstr ""
-
-#: mod/admin.php:1882
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: mod/admin.php:1883
-msgid "Log level"
-msgstr ""
-
-#: mod/admin.php:1886
-msgid "PHP logging"
-msgstr ""
-
-#: mod/admin.php:1887
-msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr ""
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "Off"
-msgstr ""
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "On"
-msgstr ""
-
-#: mod/admin.php:2015
-#, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: mod/admin.php:2023
-msgid "Manage Additional Features"
-msgstr ""
-
 #: mod/allfriends.php:43
 msgid "No friends to display."
 msgstr ""
@@ -6776,6 +5369,10 @@ msgstr ""
 msgid "Private communications are not available for this contact."
 msgstr ""
 
+#: mod/contacts.php:530 mod/admin.php:885
+msgid "Never"
+msgstr ""
+
 #: mod/contacts.php:534
 msgid "(Update was successful)"
 msgstr ""
@@ -6801,6 +5398,10 @@ msgstr ""
 msgid "Fetch further information for feeds"
 msgstr ""
 
+#: mod/contacts.php:557 mod/admin.php:894
+msgid "Disabled"
+msgstr ""
+
 #: mod/contacts.php:557
 msgid "Fetch information"
 msgstr ""
@@ -6860,6 +5461,16 @@ msgstr ""
 msgid "Update now"
 msgstr ""
 
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1412
+msgid "Unblock"
+msgstr ""
+
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1411
+msgid "Block"
+msgstr ""
+
 #: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:1000
 msgid "Unignore"
 msgstr ""
@@ -6963,7 +5574,7 @@ msgstr ""
 msgid "Search your contacts"
 msgstr ""
 
-#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:702
+#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:704
 msgid "Update"
 msgstr ""
 
@@ -7020,7 +5631,6 @@ msgid "Delete contact"
 msgstr ""
 
 #: mod/directory.php:197 view/theme/vier/theme.php:201
-#: view/theme/diabook/theme.php:525
 msgid "Global Directory"
 msgstr ""
 
@@ -7458,40 +6068,6 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr ""
-
-#: mod/item.php:340
-msgid "Empty post discarded."
-msgstr ""
-
-#: mod/item.php:895
-msgid "System error. Post not saved."
-msgstr ""
-
-#: mod/item.php:985
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
-msgstr ""
-
-#: mod/item.php:987
-#, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: mod/item.php:988
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-
-#: mod/item.php:992
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
 #: mod/maintenance.php:9
 msgid "System down for maintenance"
 msgstr ""
@@ -7508,67 +6084,1515 @@ msgstr ""
 msgid "Profile Match"
 msgstr ""
 
+#: mod/profile.php:179
+msgid "Tips for New Members"
+msgstr ""
+
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
+msgstr ""
+
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: mod/admin.php:92
+msgid "Theme settings updated."
+msgstr ""
+
+#: mod/admin.php:156 mod/admin.php:951
+msgid "Site"
+msgstr ""
+
+#: mod/admin.php:157 mod/admin.php:895 mod/admin.php:1400 mod/admin.php:1416
+msgid "Users"
+msgstr ""
+
+#: mod/admin.php:158 mod/admin.php:1518 mod/admin.php:1578 mod/settings.php:74
+msgid "Plugins"
+msgstr ""
+
+#: mod/admin.php:159 mod/admin.php:1776 mod/admin.php:1826
+msgid "Themes"
+msgstr ""
+
+#: mod/admin.php:160 mod/settings.php:52
+msgid "Additional features"
+msgstr ""
+
+#: mod/admin.php:161
+msgid "DB updates"
+msgstr ""
+
+#: mod/admin.php:162 mod/admin.php:406
+msgid "Inspect Queue"
+msgstr ""
+
+#: mod/admin.php:163 mod/admin.php:372
+msgid "Federation Statistics"
+msgstr ""
+
+#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1900
+msgid "Logs"
+msgstr ""
+
+#: mod/admin.php:178 mod/admin.php:1968
+msgid "View Logs"
+msgstr ""
+
+#: mod/admin.php:179
+msgid "probe address"
+msgstr ""
+
+#: mod/admin.php:180
+msgid "check webfinger"
+msgstr ""
+
+#: mod/admin.php:187
+msgid "Plugin Features"
+msgstr ""
+
+#: mod/admin.php:189
+msgid "diagnostics"
+msgstr ""
+
+#: mod/admin.php:190
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: mod/admin.php:306
+msgid "unknown"
+msgstr ""
+
+#: mod/admin.php:365
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
+msgstr ""
+
+#: mod/admin.php:366
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
+msgstr ""
+
+#: mod/admin.php:371 mod/admin.php:405 mod/admin.php:483 mod/admin.php:950
+#: mod/admin.php:1399 mod/admin.php:1517 mod/admin.php:1577 mod/admin.php:1775
+#: mod/admin.php:1825 mod/admin.php:1899 mod/admin.php:1967
+msgid "Administration"
+msgstr ""
+
+#: mod/admin.php:378
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
+msgstr ""
+
+#: mod/admin.php:408
+msgid "ID"
+msgstr ""
+
+#: mod/admin.php:409
+msgid "Recipient Name"
+msgstr ""
+
+#: mod/admin.php:410
+msgid "Recipient Profile"
+msgstr ""
+
+#: mod/admin.php:412
+msgid "Created"
+msgstr ""
+
+#: mod/admin.php:413
+msgid "Last Tried"
+msgstr ""
+
+#: mod/admin.php:414
+msgid ""
+"This page lists the content of the queue for outgoing postings. These are "
+"postings the initial delivery failed for. They will be resend later and "
+"eventually deleted if the delivery fails permanently."
+msgstr ""
+
+#: mod/admin.php:438
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should "
+"change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the <tt>convert_innodb.sql</"
+"tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"
+msgstr ""
+
+#: mod/admin.php:443
+msgid ""
+"You are using a MySQL version which does not support all features that "
+"Friendica uses. You should consider switching to MariaDB."
+msgstr ""
+
+#: mod/admin.php:447 mod/admin.php:1348
+msgid "Normal Account"
+msgstr ""
+
+#: mod/admin.php:448 mod/admin.php:1349
+msgid "Soapbox Account"
+msgstr ""
+
+#: mod/admin.php:449 mod/admin.php:1350
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: mod/admin.php:450 mod/admin.php:1351
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: mod/admin.php:451
+msgid "Blog Account"
+msgstr ""
+
+#: mod/admin.php:452
+msgid "Private Forum"
+msgstr ""
+
+#: mod/admin.php:478
+msgid "Message queues"
+msgstr ""
+
+#: mod/admin.php:484
+msgid "Summary"
+msgstr ""
+
+#: mod/admin.php:487
+msgid "Registered users"
+msgstr ""
+
+#: mod/admin.php:489
+msgid "Pending registrations"
+msgstr ""
+
+#: mod/admin.php:490
+msgid "Version"
+msgstr ""
+
+#: mod/admin.php:495
+msgid "Active plugins"
+msgstr ""
+
+#: mod/admin.php:520
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr ""
+
+#: mod/admin.php:823
+msgid "RINO2 needs mcrypt php extension to work."
+msgstr ""
+
+#: mod/admin.php:831
+msgid "Site settings updated."
+msgstr ""
+
+#: mod/admin.php:859 mod/settings.php:934
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: mod/admin.php:878
+msgid "No community page"
+msgstr ""
+
+#: mod/admin.php:879
+msgid "Public postings from users of this site"
+msgstr ""
+
+#: mod/admin.php:880
+msgid "Global community page"
+msgstr ""
+
+#: mod/admin.php:886
+msgid "At post arrival"
+msgstr ""
+
+#: mod/admin.php:896
+msgid "Users, Global Contacts"
+msgstr ""
+
+#: mod/admin.php:897
+msgid "Users, Global Contacts/fallback"
+msgstr ""
+
+#: mod/admin.php:901
+msgid "One month"
+msgstr ""
+
+#: mod/admin.php:902
+msgid "Three months"
+msgstr ""
+
+#: mod/admin.php:903
+msgid "Half a year"
+msgstr ""
+
+#: mod/admin.php:904
+msgid "One year"
+msgstr ""
+
+#: mod/admin.php:909
+msgid "Multi user instance"
+msgstr ""
+
+#: mod/admin.php:932
+msgid "Closed"
+msgstr ""
+
+#: mod/admin.php:933
+msgid "Requires approval"
+msgstr ""
+
+#: mod/admin.php:934
+msgid "Open"
+msgstr ""
+
+#: mod/admin.php:938
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: mod/admin.php:939
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: mod/admin.php:940
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: mod/admin.php:952 mod/admin.php:1579 mod/admin.php:1827 mod/admin.php:1901
+#: mod/admin.php:2051 mod/settings.php:678 mod/settings.php:788
+#: mod/settings.php:835 mod/settings.php:904 mod/settings.php:996
+#: mod/settings.php:1264
+msgid "Save Settings"
+msgstr ""
+
+#: mod/admin.php:953 mod/register.php:272
+msgid "Registration"
+msgstr ""
+
+#: mod/admin.php:954
+msgid "File upload"
+msgstr ""
+
+#: mod/admin.php:955
+msgid "Policies"
+msgstr ""
+
+#: mod/admin.php:957
+msgid "Auto Discovered Contact Directory"
+msgstr ""
+
+#: mod/admin.php:958
+msgid "Performance"
+msgstr ""
+
+#: mod/admin.php:959
+msgid "Worker"
+msgstr ""
+
+#: mod/admin.php:960
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr ""
+
+#: mod/admin.php:963
+msgid "Site name"
+msgstr ""
+
+#: mod/admin.php:964
+msgid "Host name"
+msgstr ""
+
+#: mod/admin.php:965
+msgid "Sender Email"
+msgstr ""
+
+#: mod/admin.php:965
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr ""
+
+#: mod/admin.php:966
+msgid "Banner/Logo"
+msgstr ""
+
+#: mod/admin.php:967
+msgid "Shortcut icon"
+msgstr ""
+
+#: mod/admin.php:967
+msgid "Link to an icon that will be used for browsers."
+msgstr ""
+
+#: mod/admin.php:968
+msgid "Touch icon"
+msgstr ""
+
+#: mod/admin.php:968
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr ""
+
+#: mod/admin.php:969
+msgid "Additional Info"
+msgstr ""
+
+#: mod/admin.php:969
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
+msgstr ""
+
+#: mod/admin.php:970
+msgid "System language"
+msgstr ""
+
+#: mod/admin.php:971
+msgid "System theme"
+msgstr ""
+
+#: mod/admin.php:971
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: mod/admin.php:972
+msgid "Mobile system theme"
+msgstr ""
+
+#: mod/admin.php:972
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: mod/admin.php:973
+msgid "SSL link policy"
+msgstr ""
+
+#: mod/admin.php:973
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: mod/admin.php:974
+msgid "Force SSL"
+msgstr ""
+
+#: mod/admin.php:974
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
+msgstr ""
+
+#: mod/admin.php:975
+msgid "Old style 'Share'"
+msgstr ""
+
+#: mod/admin.php:975
+msgid "Deactivates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: mod/admin.php:976
+msgid "Hide help entry from navigation menu"
+msgstr ""
+
+#: mod/admin.php:976
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr ""
+
+#: mod/admin.php:977
+msgid "Single user instance"
+msgstr ""
+
+#: mod/admin.php:977
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr ""
+
+#: mod/admin.php:978
+msgid "Maximum image size"
+msgstr ""
+
+#: mod/admin.php:978
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: mod/admin.php:979
+msgid "Maximum image length"
+msgstr ""
+
+#: mod/admin.php:979
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr ""
+
+#: mod/admin.php:980
+msgid "JPEG image quality"
+msgstr ""
+
+#: mod/admin.php:980
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: mod/admin.php:982
+msgid "Register policy"
+msgstr ""
+
+#: mod/admin.php:983
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: mod/admin.php:983
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user "
+"registrations to accept per day.  If register is set to closed, this setting "
+"has no effect."
+msgstr ""
+
+#: mod/admin.php:984
+msgid "Register text"
+msgstr ""
+
+#: mod/admin.php:984
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: mod/admin.php:985
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: mod/admin.php:985
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: mod/admin.php:986
+msgid "Allowed friend domains"
+msgstr ""
+
+#: mod/admin.php:986
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: mod/admin.php:987
+msgid "Allowed email domains"
+msgstr ""
+
+#: mod/admin.php:987
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: mod/admin.php:988
+msgid "Block public"
+msgstr ""
+
+#: mod/admin.php:988
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: mod/admin.php:989
+msgid "Force publish"
+msgstr ""
+
+#: mod/admin.php:989
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: mod/admin.php:990
+msgid "Global directory URL"
+msgstr ""
+
+#: mod/admin.php:990
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr ""
+
+#: mod/admin.php:991
+msgid "Allow threaded items"
+msgstr ""
+
+#: mod/admin.php:991
+msgid "Allow infinite level threading for items on this site."
+msgstr ""
+
+#: mod/admin.php:992
+msgid "Private posts by default for new users"
+msgstr ""
+
+#: mod/admin.php:992
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr ""
+
+#: mod/admin.php:993
+msgid "Don't include post content in email notifications"
+msgstr ""
+
+#: mod/admin.php:993
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr ""
+
+#: mod/admin.php:994
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr ""
+
+#: mod/admin.php:994
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr ""
+
+#: mod/admin.php:995
+msgid "Don't embed private images in posts"
+msgstr ""
+
+#: mod/admin.php:995
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a while."
+msgstr ""
+
+#: mod/admin.php:996
+msgid "Allow Users to set remote_self"
+msgstr ""
+
+#: mod/admin.php:996
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr ""
+
+#: mod/admin.php:997
+msgid "Block multiple registrations"
+msgstr ""
+
+#: mod/admin.php:997
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: mod/admin.php:998
+msgid "OpenID support"
+msgstr ""
+
+#: mod/admin.php:998
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: mod/admin.php:999
+msgid "Fullname check"
+msgstr ""
+
+#: mod/admin.php:999
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: mod/admin.php:1000
+msgid "UTF-8 Regular expressions"
+msgstr ""
+
+#: mod/admin.php:1000
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: mod/admin.php:1001
+msgid "Community Page Style"
+msgstr ""
+
+#: mod/admin.php:1001
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr ""
+
+#: mod/admin.php:1002
+msgid "Posts per user on community page"
+msgstr ""
+
+#: mod/admin.php:1002
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr ""
+
+#: mod/admin.php:1003
+msgid "Enable OStatus support"
+msgstr ""
+
+#: mod/admin.php:1003
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: mod/admin.php:1004
+msgid "OStatus conversation completion interval"
+msgstr ""
+
+#: mod/admin.php:1004
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr ""
+
+#: mod/admin.php:1005
+msgid "Only import OStatus threads from our contacts"
+msgstr ""
+
+#: mod/admin.php:1005
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option "
+"we only store threads that are started by a contact that is known on our "
+"system."
+msgstr ""
+
+#: mod/admin.php:1006
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr ""
+
+#: mod/admin.php:1008
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
+msgstr ""
+
+#: mod/admin.php:1009
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: mod/admin.php:1009
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: mod/admin.php:1010
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: mod/admin.php:1010
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: mod/admin.php:1011
+msgid "Verify SSL"
+msgstr ""
+
+#: mod/admin.php:1011
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
+msgstr ""
+
+#: mod/admin.php:1012
+msgid "Proxy user"
+msgstr ""
+
+#: mod/admin.php:1013
+msgid "Proxy URL"
+msgstr ""
+
+#: mod/admin.php:1014
+msgid "Network timeout"
+msgstr ""
+
+#: mod/admin.php:1014
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: mod/admin.php:1015
+msgid "Delivery interval"
+msgstr ""
+
+#: mod/admin.php:1015
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: mod/admin.php:1016
+msgid "Poll interval"
+msgstr ""
+
+#: mod/admin.php:1016
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: mod/admin.php:1017
+msgid "Maximum Load Average"
+msgstr ""
+
+#: mod/admin.php:1017
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: mod/admin.php:1018
+msgid "Maximum Load Average (Frontend)"
+msgstr ""
+
+#: mod/admin.php:1018
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr ""
+
+#: mod/admin.php:1019
+msgid "Maximum table size for optimization"
+msgstr ""
+
+#: mod/admin.php:1019
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
+msgstr ""
+
+#: mod/admin.php:1020
+msgid "Minimum level of fragmentation"
+msgstr ""
+
+#: mod/admin.php:1020
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr ""
+
+#: mod/admin.php:1022
+msgid "Periodical check of global contacts"
+msgstr ""
+
+#: mod/admin.php:1022
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr ""
+
+#: mod/admin.php:1023
+msgid "Days between requery"
+msgstr ""
+
+#: mod/admin.php:1023
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr ""
+
+#: mod/admin.php:1024
+msgid "Discover contacts from other servers"
+msgstr ""
+
+#: mod/admin.php:1024
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
+msgstr ""
+
+#: mod/admin.php:1025
+msgid "Timeframe for fetching global contacts"
+msgstr ""
+
+#: mod/admin.php:1025
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr ""
+
+#: mod/admin.php:1026
+msgid "Search the local directory"
+msgstr ""
+
+#: mod/admin.php:1026
+msgid ""
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
+msgstr ""
+
+#: mod/admin.php:1028
+msgid "Publish server information"
+msgstr ""
+
+#: mod/admin.php:1028
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a "
+"href='http://the-federation.info/'>the-federation.info</a> for details."
+msgstr ""
+
+#: mod/admin.php:1030
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: mod/admin.php:1030
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: mod/admin.php:1031
+msgid "Suppress Language"
+msgstr ""
+
+#: mod/admin.php:1031
+msgid "Suppress language information in meta information about a posting."
+msgstr ""
+
+#: mod/admin.php:1032
+msgid "Suppress Tags"
+msgstr ""
+
+#: mod/admin.php:1032
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr ""
+
+#: mod/admin.php:1033
+msgid "Path to item cache"
+msgstr ""
+
+#: mod/admin.php:1033
+msgid "The item caches buffers generated bbcode and external images."
+msgstr ""
+
+#: mod/admin.php:1034
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: mod/admin.php:1034
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One "
+"day). To disable the item cache, set the value to -1."
+msgstr ""
+
+#: mod/admin.php:1035
+msgid "Maximum numbers of comments per post"
+msgstr ""
+
+#: mod/admin.php:1035
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr ""
+
+#: mod/admin.php:1036
+msgid "Path for lock file"
+msgstr ""
+
+#: mod/admin.php:1036
+msgid ""
+"The lock file is used to avoid multiple pollers at one time. Only define a "
+"folder here."
+msgstr ""
+
+#: mod/admin.php:1037
+msgid "Temp path"
+msgstr ""
+
+#: mod/admin.php:1037
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr ""
+
+#: mod/admin.php:1038
+msgid "Base path to installation"
+msgstr ""
+
+#: mod/admin.php:1038
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the "
+"correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
+msgstr ""
+
+#: mod/admin.php:1039
+msgid "Disable picture proxy"
+msgstr ""
+
+#: mod/admin.php:1039
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
+msgstr ""
+
+#: mod/admin.php:1040
+msgid "Enable old style pager"
+msgstr ""
+
+#: mod/admin.php:1040
+msgid ""
+"The old style pager has page numbers but slows down massively the page speed."
+msgstr ""
+
+#: mod/admin.php:1041
+msgid "Only search in tags"
+msgstr ""
+
+#: mod/admin.php:1041
+msgid "On large systems the text search can slow down the system extremely."
+msgstr ""
+
+#: mod/admin.php:1043
+msgid "New base url"
+msgstr ""
+
+#: mod/admin.php:1043
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts "
+"of all users."
+msgstr ""
+
+#: mod/admin.php:1045
+msgid "RINO Encryption"
+msgstr ""
+
+#: mod/admin.php:1045
+msgid "Encryption layer between nodes."
+msgstr ""
+
+#: mod/admin.php:1046
+msgid "Embedly API key"
+msgstr ""
+
+#: mod/admin.php:1046
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr ""
+
+#: mod/admin.php:1048
+msgid "Enable 'worker' background processing"
+msgstr ""
+
+#: mod/admin.php:1048
+msgid ""
+"The worker background processing limits the number of parallel background "
+"jobs to a maximum number and respects the system load."
+msgstr ""
+
+#: mod/admin.php:1049
+msgid "Maximum number of parallel workers"
+msgstr ""
+
+#: mod/admin.php:1049
+msgid ""
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
+msgstr ""
+
+#: mod/admin.php:1050
+msgid "Don't use 'proc_open' with the worker"
+msgstr ""
+
+#: mod/admin.php:1050
+msgid ""
+"Enable this if your system doesn't allow the use of 'proc_open'. This can "
+"happen on shared hosters. If this is enabled you should increase the "
+"frequency of poller calls in your crontab."
+msgstr ""
+
+#: mod/admin.php:1051
+msgid "Enable fastlane"
+msgstr ""
+
+#: mod/admin.php:1051
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes "
+"with higher priority are blocked by processes of lower priority."
+msgstr ""
+
+#: mod/admin.php:1080
+msgid "Update has been marked successful"
+msgstr ""
+
+#: mod/admin.php:1088
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:1091
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:1103
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:1106
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:1110
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: mod/admin.php:1112
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr ""
+
+#: mod/admin.php:1131
+msgid "No failed updates."
+msgstr ""
+
+#: mod/admin.php:1132
+msgid "Check database structure"
+msgstr ""
+
+#: mod/admin.php:1137
+msgid "Failed Updates"
+msgstr ""
+
+#: mod/admin.php:1138
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: mod/admin.php:1139
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: mod/admin.php:1140
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: mod/admin.php:1174
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr ""
+
+#: mod/admin.php:1177
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after "
+"logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that "
+"page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default "
+"profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - "
+"and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more "
+"specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are "
+"necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr ""
+
+#: mod/admin.php:1221
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:1228
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:1275
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Register date"
+msgstr ""
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last login"
+msgstr ""
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last item"
+msgstr ""
+
+#: mod/admin.php:1392 mod/settings.php:43
+msgid "Account"
+msgstr ""
+
+#: mod/admin.php:1401
+msgid "Add User"
+msgstr ""
+
+#: mod/admin.php:1402
+msgid "select all"
+msgstr ""
+
+#: mod/admin.php:1403
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: mod/admin.php:1404
+msgid "User waiting for permanent deletion"
+msgstr ""
+
+#: mod/admin.php:1405
+msgid "Request date"
+msgstr ""
+
+#: mod/admin.php:1406
+msgid "No registrations."
+msgstr ""
+
+#: mod/admin.php:1407
+msgid "Note from the user"
+msgstr ""
+
+#: mod/admin.php:1409
+msgid "Deny"
+msgstr ""
+
+#: mod/admin.php:1413
+msgid "Site admin"
+msgstr ""
+
+#: mod/admin.php:1414
+msgid "Account expired"
+msgstr ""
+
+#: mod/admin.php:1417
+msgid "New User"
+msgstr ""
+
+#: mod/admin.php:1418
+msgid "Deleted since"
+msgstr ""
+
+#: mod/admin.php:1423
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: mod/admin.php:1424
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: mod/admin.php:1434
+msgid "Name of the new user."
+msgstr ""
+
+#: mod/admin.php:1435
+msgid "Nickname"
+msgstr ""
+
+#: mod/admin.php:1435
+msgid "Nickname of the new user."
+msgstr ""
+
+#: mod/admin.php:1436
+msgid "Email address of the new user."
+msgstr ""
+
+#: mod/admin.php:1479
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: mod/admin.php:1483
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: mod/admin.php:1494 mod/admin.php:1730
+msgid "Disable"
+msgstr ""
+
+#: mod/admin.php:1496 mod/admin.php:1732
+msgid "Enable"
+msgstr ""
+
+#: mod/admin.php:1519 mod/admin.php:1777
+msgid "Toggle"
+msgstr ""
+
+#: mod/admin.php:1527 mod/admin.php:1786
+msgid "Author: "
+msgstr ""
+
+#: mod/admin.php:1528 mod/admin.php:1787
+msgid "Maintainer: "
+msgstr ""
+
+#: mod/admin.php:1580
+msgid "Reload active plugins"
+msgstr ""
+
+#: mod/admin.php:1585
+#, php-format
+msgid ""
+"There are currently no plugins available on your node. You can find the "
+"official plugin repository at %1$s and might find other interesting plugins "
+"in the open plugin registry at %2$s"
+msgstr ""
+
+#: mod/admin.php:1690
+msgid "No themes found."
+msgstr ""
+
+#: mod/admin.php:1768
+msgid "Screenshot"
+msgstr ""
+
+#: mod/admin.php:1828
+msgid "Reload active themes"
+msgstr ""
+
+#: mod/admin.php:1833
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
+msgstr ""
+
+#: mod/admin.php:1834
+msgid "[Experimental]"
+msgstr ""
+
+#: mod/admin.php:1835
+msgid "[Unsupported]"
+msgstr ""
+
+#: mod/admin.php:1859
+msgid "Log settings updated."
+msgstr ""
+
+#: mod/admin.php:1891
+msgid "PHP log currently enabled."
+msgstr ""
+
+#: mod/admin.php:1893
+msgid "PHP log currently disabled."
+msgstr ""
+
+#: mod/admin.php:1902
+msgid "Clear"
+msgstr ""
+
+#: mod/admin.php:1907
+msgid "Enable Debugging"
+msgstr ""
+
+#: mod/admin.php:1908
+msgid "Log file"
+msgstr ""
+
+#: mod/admin.php:1908
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: mod/admin.php:1909
+msgid "Log level"
+msgstr ""
+
+#: mod/admin.php:1912
+msgid "PHP logging"
+msgstr ""
+
+#: mod/admin.php:1913
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
+msgstr ""
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "Off"
+msgstr ""
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "On"
+msgstr ""
+
+#: mod/admin.php:2041
+#, php-format
+msgid "Lock feature %s"
+msgstr ""
+
+#: mod/admin.php:2049
+msgid "Manage Additional Features"
+msgstr ""
+
+#: mod/item.php:116
+msgid "Unable to locate original post."
+msgstr ""
+
+#: mod/item.php:340
+msgid "Empty post discarded."
+msgstr ""
+
+#: mod/item.php:898
+msgid "System error. Post not saved."
+msgstr ""
+
+#: mod/item.php:988
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
+msgstr ""
+
+#: mod/item.php:990
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: mod/item.php:991
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr ""
+
+#: mod/item.php:995
+#, php-format
+msgid "%s posted an update."
+msgstr ""
+
 #: mod/network.php:398
 #, php-format
-msgid "Warning: This group contains %s member from an insecure network."
+msgid ""
+"Warning: This group contains %s member from a network that doesn't allow non "
+"public messages."
 msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
 msgstr[0] ""
 msgstr[1] ""
 
 #: mod/network.php:401
-msgid "Private messages to this group are at risk of public disclosure."
+msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: mod/network.php:528
+#: mod/network.php:529
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: mod/network.php:533
+#: mod/network.php:534
 msgid "Invalid contact."
 msgstr ""
 
-#: mod/network.php:826
+#: mod/network.php:827
 msgid "Commented Order"
 msgstr ""
 
-#: mod/network.php:829
+#: mod/network.php:830
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: mod/network.php:834
+#: mod/network.php:835
 msgid "Posted Order"
 msgstr ""
 
-#: mod/network.php:837
+#: mod/network.php:838
 msgid "Sort by Post Date"
 msgstr ""
 
-#: mod/network.php:848
+#: mod/network.php:849
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: mod/network.php:856
+#: mod/network.php:857
 msgid "New"
 msgstr ""
 
-#: mod/network.php:859
+#: mod/network.php:860
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: mod/network.php:867
+#: mod/network.php:868
 msgid "Shared Links"
 msgstr ""
 
-#: mod/network.php:870
+#: mod/network.php:871
 msgid "Interesting Links"
 msgstr ""
 
-#: mod/network.php:878
+#: mod/network.php:879
 msgid "Starred"
 msgstr ""
 
-#: mod/network.php:881
+#: mod/network.php:882
 msgid "Favourite Posts"
 msgstr ""
 
@@ -7650,11 +7674,11 @@ msgstr ""
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1295
+#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1300
 msgid "Show to Groups"
 msgstr ""
 
-#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1296
+#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1301
 msgid "Show to Contacts"
 msgstr ""
 
@@ -7758,22 +7782,18 @@ msgstr ""
 msgid "View Album"
 msgstr ""
 
-#: mod/ping.php:234
+#: mod/ping.php:211
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/ping.php:249
+#: mod/ping.php:226
 msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/ping.php:264
+#: mod/ping.php:241
 msgid "{0} requested registration"
 msgstr ""
 
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr ""
-
 #: mod/register.php:93
 msgid ""
 "Registration successful. Please check your email for further instructions."
@@ -7794,121 +7814,86 @@ msgstr ""
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/register.php:153
+#: mod/register.php:160
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/register.php:219
+#: mod/register.php:226
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: mod/register.php:220
+#: mod/register.php:227
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: mod/register.php:221
+#: mod/register.php:228
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/register.php:235
+#: mod/register.php:242
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/register.php:259
+#: mod/register.php:267
+msgid "Note for the admin"
+msgstr ""
+
+#: mod/register.php:267
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr ""
+
+#: mod/register.php:268
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/register.php:260
+#: mod/register.php:269
 msgid "Your invitation ID: "
 msgstr ""
 
-#: mod/register.php:271
+#: mod/register.php:280
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/register.php:272
+#: mod/register.php:281
 msgid "Your Email Address: "
 msgstr ""
 
-#: mod/register.php:274 mod/settings.php:1266
+#: mod/register.php:283 mod/settings.php:1271
 msgid "New Password:"
 msgstr ""
 
-#: mod/register.php:274
+#: mod/register.php:283
 msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/register.php:275 mod/settings.php:1267
+#: mod/register.php:284 mod/settings.php:1272
 msgid "Confirm:"
 msgstr ""
 
-#: mod/register.php:276
+#: mod/register.php:285
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: mod/register.php:277
+#: mod/register.php:286
 msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/register.php:287
+#: mod/register.php:296
 msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr ""
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr ""
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr ""
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: mod/videos.php:120
-msgid "Do you really want to delete this video?"
-msgstr ""
-
-#: mod/videos.php:125
-msgid "Delete Video"
-msgstr ""
-
-#: mod/videos.php:204
-msgid "No videos selected"
-msgstr ""
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr ""
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr ""
-
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr ""
-
 #: mod/settings.php:60
 msgid "Display"
 msgstr ""
 
-#: mod/settings.php:67 mod/settings.php:884
+#: mod/settings.php:67 mod/settings.php:886
 msgid "Social Networks"
 msgstr ""
 
@@ -7936,675 +7921,731 @@ msgstr ""
 msgid "Features updated"
 msgstr ""
 
-#: mod/settings.php:357
+#: mod/settings.php:359
 msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: mod/settings.php:376
+#: mod/settings.php:378
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: mod/settings.php:384
+#: mod/settings.php:386
 msgid "Wrong password."
 msgstr ""
 
-#: mod/settings.php:395
+#: mod/settings.php:397
 msgid "Password changed."
 msgstr ""
 
-#: mod/settings.php:397
+#: mod/settings.php:399
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: mod/settings.php:477
+#: mod/settings.php:479
 msgid " Please use a shorter name."
 msgstr ""
 
-#: mod/settings.php:479
+#: mod/settings.php:481
 msgid " Name too short."
 msgstr ""
 
-#: mod/settings.php:488
+#: mod/settings.php:490
 msgid "Wrong Password"
 msgstr ""
 
-#: mod/settings.php:493
+#: mod/settings.php:495
 msgid " Not valid email."
 msgstr ""
 
-#: mod/settings.php:499
+#: mod/settings.php:501
 msgid " Cannot change to that email."
 msgstr ""
 
-#: mod/settings.php:555
+#: mod/settings.php:557
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: mod/settings.php:559
+#: mod/settings.php:561
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: mod/settings.php:599
+#: mod/settings.php:601
 msgid "Settings updated."
 msgstr ""
 
-#: mod/settings.php:675 mod/settings.php:701 mod/settings.php:737
+#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
 msgid "Add application"
 msgstr ""
 
-#: mod/settings.php:679 mod/settings.php:705
+#: mod/settings.php:681 mod/settings.php:707
 msgid "Consumer Key"
 msgstr ""
 
-#: mod/settings.php:680 mod/settings.php:706
+#: mod/settings.php:682 mod/settings.php:708
 msgid "Consumer Secret"
 msgstr ""
 
-#: mod/settings.php:681 mod/settings.php:707
+#: mod/settings.php:683 mod/settings.php:709
 msgid "Redirect"
 msgstr ""
 
-#: mod/settings.php:682 mod/settings.php:708
+#: mod/settings.php:684 mod/settings.php:710
 msgid "Icon url"
 msgstr ""
 
-#: mod/settings.php:693
+#: mod/settings.php:695
 msgid "You can't edit this application."
 msgstr ""
 
-#: mod/settings.php:736
+#: mod/settings.php:738
 msgid "Connected Apps"
 msgstr ""
 
-#: mod/settings.php:740
+#: mod/settings.php:742
 msgid "Client key starts with"
 msgstr ""
 
-#: mod/settings.php:741
+#: mod/settings.php:743
 msgid "No name"
 msgstr ""
 
-#: mod/settings.php:742
+#: mod/settings.php:744
 msgid "Remove authorization"
 msgstr ""
 
-#: mod/settings.php:754
+#: mod/settings.php:756
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: mod/settings.php:762
+#: mod/settings.php:764
 msgid "Plugin Settings"
 msgstr ""
 
-#: mod/settings.php:784
+#: mod/settings.php:786
 msgid "Additional Features"
 msgstr ""
 
-#: mod/settings.php:794 mod/settings.php:798
+#: mod/settings.php:796 mod/settings.php:800
 msgid "General Social Media Settings"
 msgstr ""
 
-#: mod/settings.php:804
+#: mod/settings.php:806
 msgid "Disable intelligent shortening"
 msgstr ""
 
-#: mod/settings.php:806
+#: mod/settings.php:808
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the "
 "original friendica post."
 msgstr ""
 
-#: mod/settings.php:812
+#: mod/settings.php:814
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr ""
 
-#: mod/settings.php:814
+#: mod/settings.php:816
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr ""
 
-#: mod/settings.php:820
+#: mod/settings.php:822
 msgid "Default group for OStatus contacts"
 msgstr ""
 
-#: mod/settings.php:826
+#: mod/settings.php:828
 msgid "Your legacy GNU Social account"
 msgstr ""
 
-#: mod/settings.php:828
+#: mod/settings.php:830
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr ""
 
-#: mod/settings.php:831
+#: mod/settings.php:833
 msgid "Repair OStatus subscriptions"
 msgstr ""
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "enabled"
 msgstr ""
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "disabled"
 msgstr ""
 
-#: mod/settings.php:841
+#: mod/settings.php:843
 msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: mod/settings.php:877
+#: mod/settings.php:879
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: mod/settings.php:889
+#: mod/settings.php:891
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: mod/settings.php:890
+#: mod/settings.php:892
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: mod/settings.php:891
+#: mod/settings.php:893
 msgid "Last successful email check:"
 msgstr ""
 
-#: mod/settings.php:893
+#: mod/settings.php:895
 msgid "IMAP server name:"
 msgstr ""
 
-#: mod/settings.php:894
+#: mod/settings.php:896
 msgid "IMAP port:"
 msgstr ""
 
-#: mod/settings.php:895
+#: mod/settings.php:897
 msgid "Security:"
 msgstr ""
 
-#: mod/settings.php:895 mod/settings.php:900
+#: mod/settings.php:897 mod/settings.php:902
 msgid "None"
 msgstr ""
 
-#: mod/settings.php:896
+#: mod/settings.php:898
 msgid "Email login name:"
 msgstr ""
 
-#: mod/settings.php:897
+#: mod/settings.php:899
 msgid "Email password:"
 msgstr ""
 
-#: mod/settings.php:898
+#: mod/settings.php:900
 msgid "Reply-to address:"
 msgstr ""
 
-#: mod/settings.php:899
+#: mod/settings.php:901
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Action after import:"
 msgstr ""
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Move to folder"
 msgstr ""
 
-#: mod/settings.php:901
+#: mod/settings.php:903
 msgid "Move to folder:"
 msgstr ""
 
-#: mod/settings.php:990
+#: mod/settings.php:994
 msgid "Display Settings"
 msgstr ""
 
-#: mod/settings.php:996 mod/settings.php:1018
+#: mod/settings.php:1000 mod/settings.php:1023
 msgid "Display Theme:"
 msgstr ""
 
-#: mod/settings.php:997
+#: mod/settings.php:1001
 msgid "Mobile Theme:"
 msgstr ""
 
-#: mod/settings.php:998
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: mod/settings.php:998
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr ""
-
-#: mod/settings.php:999
-msgid "Number of items to display per page:"
-msgstr ""
-
-#: mod/settings.php:999 mod/settings.php:1000
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: mod/settings.php:1000
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr ""
-
-#: mod/settings.php:1001
-msgid "Don't show emoticons"
+#: mod/settings.php:1002
+msgid "Suppress warning of insecure networks"
 msgstr ""
 
 #: mod/settings.php:1002
-msgid "Calendar"
+msgid ""
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
 msgstr ""
 
 #: mod/settings.php:1003
-msgid "Beginning of week:"
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: mod/settings.php:1003
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr ""
 
 #: mod/settings.php:1004
-msgid "Don't show notices"
+msgid "Number of items to display per page:"
+msgstr ""
+
+#: mod/settings.php:1004 mod/settings.php:1005
+msgid "Maximum of 100 items"
 msgstr ""
 
 #: mod/settings.php:1005
-msgid "Infinite scroll"
+msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
 #: mod/settings.php:1006
+msgid "Don't show emoticons"
+msgstr ""
+
+#: mod/settings.php:1007
+msgid "Calendar"
+msgstr ""
+
+#: mod/settings.php:1008
+msgid "Beginning of week:"
+msgstr ""
+
+#: mod/settings.php:1009
+msgid "Don't show notices"
+msgstr ""
+
+#: mod/settings.php:1010
+msgid "Infinite scroll"
+msgstr ""
+
+#: mod/settings.php:1011
 msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid "Bandwith Saver Mode"
 msgstr ""
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr ""
 
-#: mod/settings.php:1009
+#: mod/settings.php:1014
 msgid "General Theme Settings"
 msgstr ""
 
-#: mod/settings.php:1010
+#: mod/settings.php:1015
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: mod/settings.php:1011
+#: mod/settings.php:1016
 msgid "Content Settings"
 msgstr ""
 
-#: mod/settings.php:1012 view/theme/frio/config.php:61
-#: view/theme/cleanzero/config.php:82 view/theme/quattro/config.php:66
-#: view/theme/dispy/config.php:72 view/theme/vier/config.php:109
-#: view/theme/diabook/config.php:150 view/theme/duepuntozero/config.php:61
+#: mod/settings.php:1017 view/theme/frio/config.php:61
+#: view/theme/quattro/config.php:66 view/theme/vier/config.php:109
+#: view/theme/duepuntozero/config.php:61
 msgid "Theme settings"
 msgstr ""
 
-#: mod/settings.php:1094
+#: mod/settings.php:1099
 msgid "Account Types"
 msgstr ""
 
-#: mod/settings.php:1095
+#: mod/settings.php:1100
 msgid "Personal Page Subtypes"
 msgstr ""
 
-#: mod/settings.php:1096
+#: mod/settings.php:1101
 msgid "Community Forum Subtypes"
 msgstr ""
 
-#: mod/settings.php:1103
+#: mod/settings.php:1108
 msgid "Personal Page"
 msgstr ""
 
-#: mod/settings.php:1104
+#: mod/settings.php:1109
 msgid "This account is a regular personal profile"
 msgstr ""
 
-#: mod/settings.php:1107
+#: mod/settings.php:1112
 msgid "Organisation Page"
 msgstr ""
 
-#: mod/settings.php:1108
+#: mod/settings.php:1113
 msgid "This account is a profile for an organisation"
 msgstr ""
 
-#: mod/settings.php:1111
+#: mod/settings.php:1116
 msgid "News Page"
 msgstr ""
 
-#: mod/settings.php:1112
+#: mod/settings.php:1117
 msgid "This account is a news account/reflector"
 msgstr ""
 
-#: mod/settings.php:1115
+#: mod/settings.php:1120
 msgid "Community Forum"
 msgstr ""
 
-#: mod/settings.php:1116
+#: mod/settings.php:1121
 msgid ""
 "This account is a community forum where people can discuss with each other"
 msgstr ""
 
-#: mod/settings.php:1119
+#: mod/settings.php:1124
 msgid "Normal Account Page"
 msgstr ""
 
-#: mod/settings.php:1120
+#: mod/settings.php:1125
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: mod/settings.php:1123
+#: mod/settings.php:1128
 msgid "Soapbox Page"
 msgstr ""
 
-#: mod/settings.php:1124
+#: mod/settings.php:1129
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: mod/settings.php:1127
+#: mod/settings.php:1132
 msgid "Public Forum"
 msgstr ""
 
-#: mod/settings.php:1128
+#: mod/settings.php:1133
 msgid "Automatically approve all contact requests"
 msgstr ""
 
-#: mod/settings.php:1131
+#: mod/settings.php:1136
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/settings.php:1132
+#: mod/settings.php:1137
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: mod/settings.php:1135
+#: mod/settings.php:1140
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: mod/settings.php:1136
+#: mod/settings.php:1141
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "OpenID:"
 msgstr ""
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: mod/settings.php:1158
+#: mod/settings.php:1163
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: mod/settings.php:1164
+#: mod/settings.php:1169
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/settings.php:1172
+#: mod/settings.php:1177
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/settings.php:1176
+#: mod/settings.php:1181
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr ""
 
-#: mod/settings.php:1181
+#: mod/settings.php:1186
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: mod/settings.php:1187
+#: mod/settings.php:1192
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: mod/settings.php:1193
+#: mod/settings.php:1198
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: mod/settings.php:1199
+#: mod/settings.php:1204
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: mod/settings.php:1207
+#: mod/settings.php:1212
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: mod/settings.php:1215
+#: mod/settings.php:1220
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: mod/settings.php:1223
+#: mod/settings.php:1228
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: mod/settings.php:1224
+#: mod/settings.php:1229
 msgid "Advanced Expiration"
 msgstr ""
 
-#: mod/settings.php:1225
+#: mod/settings.php:1230
 msgid "Expire posts:"
 msgstr ""
 
-#: mod/settings.php:1226
+#: mod/settings.php:1231
 msgid "Expire personal notes:"
 msgstr ""
 
-#: mod/settings.php:1227
+#: mod/settings.php:1232
 msgid "Expire starred posts:"
 msgstr ""
 
-#: mod/settings.php:1228
+#: mod/settings.php:1233
 msgid "Expire photos:"
 msgstr ""
 
-#: mod/settings.php:1229
+#: mod/settings.php:1234
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: mod/settings.php:1257
+#: mod/settings.php:1262
 msgid "Account Settings"
 msgstr ""
 
-#: mod/settings.php:1265
+#: mod/settings.php:1270
 msgid "Password Settings"
 msgstr ""
 
-#: mod/settings.php:1267
+#: mod/settings.php:1272
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: mod/settings.php:1268
+#: mod/settings.php:1273
 msgid "Current Password:"
 msgstr ""
 
-#: mod/settings.php:1268 mod/settings.php:1269
+#: mod/settings.php:1273 mod/settings.php:1274
 msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: mod/settings.php:1269
+#: mod/settings.php:1274
 msgid "Password:"
 msgstr ""
 
-#: mod/settings.php:1273
+#: mod/settings.php:1278
 msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:1275
+#: mod/settings.php:1280
 msgid "Email Address:"
 msgstr ""
 
-#: mod/settings.php:1276
+#: mod/settings.php:1281
 msgid "Your Timezone:"
 msgstr ""
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid "Your Language:"
 msgstr ""
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr ""
 
-#: mod/settings.php:1278
+#: mod/settings.php:1283
 msgid "Default Post Location:"
 msgstr ""
 
-#: mod/settings.php:1279
+#: mod/settings.php:1284
 msgid "Use Browser Location:"
 msgstr ""
 
-#: mod/settings.php:1282
+#: mod/settings.php:1287
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: mod/settings.php:1284
+#: mod/settings.php:1289
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: mod/settings.php:1284 mod/settings.php:1314
+#: mod/settings.php:1289 mod/settings.php:1319
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: mod/settings.php:1285
+#: mod/settings.php:1290
 msgid "Default Post Permissions"
 msgstr ""
 
-#: mod/settings.php:1286
+#: mod/settings.php:1291
 msgid "(click to open/close)"
 msgstr ""
 
-#: mod/settings.php:1297
+#: mod/settings.php:1302
 msgid "Default Private Post"
 msgstr ""
 
-#: mod/settings.php:1298
+#: mod/settings.php:1303
 msgid "Default Public Post"
 msgstr ""
 
-#: mod/settings.php:1302
+#: mod/settings.php:1307
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: mod/settings.php:1314
+#: mod/settings.php:1319
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: mod/settings.php:1317
+#: mod/settings.php:1322
 msgid "Notification Settings"
 msgstr ""
 
-#: mod/settings.php:1318
+#: mod/settings.php:1323
 msgid "By default post a status message when:"
 msgstr ""
 
-#: mod/settings.php:1319
+#: mod/settings.php:1324
 msgid "accepting a friend request"
 msgstr ""
 
-#: mod/settings.php:1320
+#: mod/settings.php:1325
 msgid "joining a forum/community"
 msgstr ""
 
-#: mod/settings.php:1321
+#: mod/settings.php:1326
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: mod/settings.php:1322
+#: mod/settings.php:1327
 msgid "Send a notification email when:"
 msgstr ""
 
-#: mod/settings.php:1323
+#: mod/settings.php:1328
 msgid "You receive an introduction"
 msgstr ""
 
-#: mod/settings.php:1324
+#: mod/settings.php:1329
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: mod/settings.php:1325
+#: mod/settings.php:1330
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: mod/settings.php:1326
+#: mod/settings.php:1331
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: mod/settings.php:1327
+#: mod/settings.php:1332
 msgid "You receive a private message"
 msgstr ""
 
-#: mod/settings.php:1328
+#: mod/settings.php:1333
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: mod/settings.php:1329
+#: mod/settings.php:1334
 msgid "You are tagged in a post"
 msgstr ""
 
-#: mod/settings.php:1330
+#: mod/settings.php:1335
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Activate desktop notifications"
 msgstr ""
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: mod/settings.php:1334
+#: mod/settings.php:1339
 msgid "Text-only notification emails"
 msgstr ""
 
-#: mod/settings.php:1336
+#: mod/settings.php:1341
 msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: mod/settings.php:1338
+#: mod/settings.php:1343
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: mod/settings.php:1339
+#: mod/settings.php:1344
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: mod/settings.php:1342
+#: mod/settings.php:1347
 msgid "Relocate"
 msgstr ""
 
-#: mod/settings.php:1343
+#: mod/settings.php:1348
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr ""
 
-#: mod/settings.php:1344
+#: mod/settings.php:1349
 msgid "Resend relocate message to contacts"
 msgstr ""
 
+#: mod/videos.php:120
+msgid "Do you really want to delete this video?"
+msgstr ""
+
+#: mod/videos.php:125
+msgid "Delete Video"
+msgstr ""
+
+#: mod/videos.php:204
+msgid "No videos selected"
+msgstr ""
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr ""
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr ""
+
+#: mod/viewcontacts.php:72
+msgid "No contacts."
+msgstr ""
+
+#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
+#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
+#: mod/wall_upload.php:122 mod/wall_upload.php:125
+msgid "Invalid request."
+msgstr ""
+
+#: mod/wall_attach.php:94
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr ""
+
+#: mod/wall_attach.php:94
+msgid "Or - did you try to upload an empty file?"
+msgstr ""
+
+#: mod/wall_attach.php:105
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr ""
+
+#: mod/wall_attach.php:156 mod/wall_attach.php:172
+msgid "File upload failed."
+msgstr ""
+
 #: object/Item.php:370
 msgid "via"
 msgstr ""
@@ -8689,23 +8730,6 @@ msgstr ""
 msgid "Visitor"
 msgstr ""
 
-#: view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
-msgstr ""
-
-#: view/theme/cleanzero/config.php:84 view/theme/dispy/config.php:73
-#: view/theme/diabook/config.php:151
-msgid "Set font-size for posts and comments"
-msgstr ""
-
-#: view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr ""
-
-#: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr ""
-
 #: view/theme/quattro/config.php:67
 msgid "Alignment"
 msgstr ""
@@ -8718,6 +8742,10 @@ msgstr ""
 msgid "Center"
 msgstr ""
 
+#: view/theme/quattro/config.php:68
+msgid "Color scheme"
+msgstr ""
+
 #: view/theme/quattro/config.php:69
 msgid "Posts font size"
 msgstr ""
@@ -8726,33 +8754,19 @@ msgstr ""
 msgid "Textareas font size"
 msgstr ""
 
-#: view/theme/dispy/config.php:74 view/theme/diabook/config.php:152
-msgid "Set line-height for posts and comments"
-msgstr ""
-
-#: view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr ""
-
 #: view/theme/vier/theme.php:152 view/theme/vier/config.php:112
-#: view/theme/diabook/theme.php:391 view/theme/diabook/theme.php:626
-#: view/theme/diabook/config.php:160
 msgid "Community Profiles"
 msgstr ""
 
 #: view/theme/vier/theme.php:181 view/theme/vier/config.php:116
-#: view/theme/diabook/theme.php:412 view/theme/diabook/theme.php:630
-#: view/theme/diabook/config.php:164
 msgid "Last users"
 msgstr ""
 
 #: view/theme/vier/theme.php:199 view/theme/vier/config.php:115
-#: view/theme/diabook/theme.php:523 view/theme/diabook/theme.php:629
-#: view/theme/diabook/config.php:163
 msgid "Find Friends"
 msgstr ""
 
-#: view/theme/vier/theme.php:200 view/theme/diabook/theme.php:524
+#: view/theme/vier/theme.php:200
 msgid "Local Directory"
 msgstr ""
 
@@ -8761,8 +8775,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: view/theme/vier/theme.php:373 view/theme/vier/config.php:114
-#: view/theme/diabook/theme.php:606 view/theme/diabook/theme.php:628
-#: view/theme/diabook/config.php:162
 msgid "Connect Services"
 msgstr ""
 
@@ -8774,68 +8786,14 @@ msgstr ""
 msgid "Set style"
 msgstr ""
 
-#: view/theme/vier/config.php:111 view/theme/diabook/theme.php:130
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
-#: view/theme/diabook/config.php:158
+#: view/theme/vier/config.php:111
 msgid "Community Pages"
 msgstr ""
 
-#: view/theme/vier/config.php:113 view/theme/diabook/theme.php:599
-#: view/theme/diabook/theme.php:627 view/theme/diabook/config.php:161
+#: view/theme/vier/config.php:113
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: view/theme/diabook/theme.php:125
-msgid "Your contacts"
-msgstr ""
-
-#: view/theme/diabook/theme.php:128
-msgid "Your personal photos"
-msgstr ""
-
-#: view/theme/diabook/theme.php:441 view/theme/diabook/theme.php:632
-#: view/theme/diabook/config.php:166
-msgid "Last likes"
-msgstr ""
-
-#: view/theme/diabook/theme.php:486 view/theme/diabook/theme.php:631
-#: view/theme/diabook/config.php:165
-msgid "Last photos"
-msgstr ""
-
-#: view/theme/diabook/theme.php:579 view/theme/diabook/theme.php:625
-#: view/theme/diabook/config.php:159
-msgid "Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/theme.php:585 view/theme/diabook/config.php:156
-msgid "Set longitude (X) for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/theme.php:586 view/theme/diabook/config.php:157
-msgid "Set latitude (Y) for Earth Layers"
-msgstr ""
-
-#: view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
-msgstr ""
-
-#: view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
-msgstr ""
-
-#: view/theme/diabook/config.php:154
-msgid "Set color scheme"
-msgstr ""
-
-#: view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
-msgstr ""
-
 #: view/theme/duepuntozero/config.php:45
 msgid "greenzero"
 msgstr ""
@@ -8868,51 +8826,51 @@ msgstr ""
 msgid "toggle mobile"
 msgstr ""
 
-#: boot.php:968
+#: boot.php:969
 msgid "Delete this item?"
 msgstr ""
 
-#: boot.php:971
+#: boot.php:972
 msgid "show fewer"
 msgstr ""
 
-#: boot.php:1641
+#: boot.php:1650
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: boot.php:1753
+#: boot.php:1762
 msgid "Create a New Account"
 msgstr ""
 
-#: boot.php:1782
+#: boot.php:1791
 msgid "Password: "
 msgstr ""
 
-#: boot.php:1783
+#: boot.php:1792
 msgid "Remember me"
 msgstr ""
 
-#: boot.php:1786
+#: boot.php:1795
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: boot.php:1792
+#: boot.php:1801
 msgid "Forgot your password?"
 msgstr ""
 
-#: boot.php:1795
+#: boot.php:1804
 msgid "Website Terms of Service"
 msgstr ""
 
-#: boot.php:1796
+#: boot.php:1805
 msgid "terms of service"
 msgstr ""
 
-#: boot.php:1798
+#: boot.php:1807
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: boot.php:1799
+#: boot.php:1808
 msgid "privacy policy"
 msgstr ""

util/vagrant_provision.sh

@@ -32,16 +32,30 @@ sudo apt-get install -y apache2
 sudo a2enmod rewrite actions ssl
 sudo cp /vagrant/util/vagrant_vhost.sh /usr/local/bin/vhost
 sudo chmod guo+x /usr/local/bin/vhost
-sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica.dev
-sudo a2dissite 000-default
-sudo service apache2 restart
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-trusty.dev
+    sudo a2dissite 000-default
+    sudo service apache2 restart
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    sudo vhost -s 192.168.22.11.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-xenial.dev
+    sudo a2dissite 000-default
+    sudo systemctl restart apache2
+fi
 
 #Install php
-echo ">>> Installing PHP5"
-sudo apt-get install -y php5 libapache2-mod-php5 php5-cli php5-mysql php5-curl php5-gd
-sudo apt-get install -y imagemagick
-sudo apt-get install -y php5-imagick
-sudo service apache2 restart
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    echo ">>> Installing PHP5"
+    sudo apt-get install -y php5 libapache2-mod-php5 php5-cli php5-mysql php5-curl php5-gd
+    sudo apt-get install -y imagemagick
+    sudo apt-get install -y php5-imagick
+    sudo service apache2 restart
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    echo ">>> Installing PHP7"
+    sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd
+    sudo apt-get install -y imagemagick
+    sudo apt-get install -y php-imagick
+    sudo systemctl restart apache2
+fi
 
 
 #Install mysql
@@ -59,12 +73,21 @@ Q1="GRANT ALL ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;"
 Q2="FLUSH PRIVILEGES;"
 SQL="${Q1}${Q2}"
 $MYSQL -uroot -proot -e "$SQL"
-service mysql restart
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    service mysql restart
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    systemctl restart mysql
+fi
+
 
 
 #configure rudimentary mail server (local delivery only)
 #add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'.
-debconf-set-selections <<< "postfix postfix/mailname string friendica.dev"
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    debconf-set-selections <<< "postfix postfix/mailname string friendica-trusty.dev"
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    debconf-set-selections <<< "postfix postfix/mailname string friendica-xenial.dev"
+fi
 debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'"
 sudo apt-get install -y postfix mailutils libmailutils-dev
 sudo echo -e "friendica1:	vagrant\nfriendica2:	vagrant\nfriendica3:	vagrant\nfriendica4:	vagrant\nfriendica5:	vagrant" >> /etc/aliases && sudo newaliases

view/global.css

@@ -464,3 +464,20 @@ td.federation-data {
 #settings-form .pageflags {
     margin: 0 0 20px 30px;
 }
+
+/* admin pending user notes */
+td.pendingnote {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+td.pendingnote > p > span {
+	font-weight: bold;
+}
+
+/* warning message */
+.warning-message {
+	padding: 10px;
+	margin: 5px;
+	border-left: 5px solid #f00;
+	font-weight: bold;
+}

view/lang/de/messages.po

@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-10 15:43+0100\n"
-"PO-Revision-Date: 2016-11-11 10:10+0000\n"
+"POT-Creation-Date: 2016-11-20 21:45+0100\n"
+"PO-Revision-Date: 2016-11-21 10:27+0000\n"
 "Last-Translator: Andreas H.\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -78,8 +78,8 @@ msgstr "Leute finden"
 msgid "Enter name or interest"
 msgstr "Name oder Interessen eingeben"
 
-#: include/contact_widgets.php:32 include/conversation.php:981
-#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66
+#: include/contact_widgets.php:32 include/Contact.php:375
+#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66
 #: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
 #: mod/suggest.php:83
 msgid "Connect/Follow"
@@ -94,12 +94,11 @@ msgid "Find"
 msgstr "Finde"
 
 #: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:203 view/theme/diabook/theme.php:527
+#: view/theme/vier/theme.php:203
 msgid "Friend Suggestions"
 msgstr "Kontaktvorschläge"
 
 #: include/contact_widgets.php:36 view/theme/vier/theme.php:202
-#: view/theme/diabook/theme.php:526
 msgid "Similar Interests"
 msgstr "Ähnliche Interessen"
 
@@ -108,7 +107,6 @@ msgid "Random Profile"
 msgstr "Zufälliges Profil"
 
 #: include/contact_widgets.php:38 view/theme/vier/theme.php:204
-#: view/theme/diabook/theme.php:528
 msgid "Invite Friends"
 msgstr "Freunde einladen"
 
@@ -140,8 +138,8 @@ msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
 #: include/contact_widgets.php:242 include/ForumManager.php:119
-#: include/items.php:2188 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:970
+#: include/items.php:2223 mod/content.php:624 object/Item.php:432
+#: view/theme/vier/theme.php:260 boot.php:971
 msgid "show more"
 msgstr "mehr anzeigen"
 
@@ -478,133 +476,6 @@ msgstr "Kontakte in keiner Gruppe"
 msgid "add"
 msgstr "hinzufügen"
 
-#: include/user.php:39 mod/settings.php:371
-msgid "Passwords do not match. Password unchanged."
-msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
-
-#: include/user.php:48
-msgid "An invitation is required."
-msgstr "Du benötigst eine Einladung."
-
-#: include/user.php:53
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht überprüft werden."
-
-#: include/user.php:61
-msgid "Invalid OpenID url"
-msgstr "Ungültige OpenID URL"
-
-#: include/user.php:82
-msgid "Please enter the required information."
-msgstr "Bitte trage die erforderlichen Informationen ein."
-
-#: include/user.php:96
-msgid "Please use a shorter name."
-msgstr "Bitte verwende einen kürzeren Namen."
-
-#: include/user.php:98
-msgid "Name too short."
-msgstr "Der Name ist zu kurz."
-
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
-
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
-
-#: include/user.php:121
-msgid "Not a valid email address."
-msgstr "Keine gültige E-Mail-Adresse."
-
-#: include/user.php:134
-msgid "Cannot use that email."
-msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
-
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
-msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
-
-#: include/user.php:147 include/user.php:245
-msgid "Nickname is already registered. Please choose another."
-msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
-
-#: include/user.php:157
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
-
-#: include/user.php:173
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
-
-#: include/user.php:231
-msgid "An error occurred during registration. Please try again."
-msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
-
-#: include/user.php:256 view/theme/duepuntozero/config.php:44
-msgid "default"
-msgstr "Standard"
-
-#: include/user.php:266
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
-
-#: include/user.php:345 include/user.php:352 include/user.php:359
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:210 mod/profile_photo.php:302
-#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
-#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
-#: mod/photos.php:1819 view/theme/diabook/theme.php:500
-msgid "Profile Photos"
-msgstr "Profilbilder"
-
-#: include/user.php:387
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
-msgstr "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
-
-#: include/user.php:391
-#, php-format
-msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
-msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
-
-#: include/user.php:423 mod/admin.php:1184
-#, php-format
-msgid "Registration details for %s"
-msgstr "Details der Registration von %s"
-
 #: include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr "Unbekannt | Nicht kategorisiert"
@@ -629,19 +500,19 @@ msgstr "OK, wahrscheinlich harmlos"
 msgid "Reputable, has my trust"
 msgstr "Seriös, hat mein Vertrauen"
 
-#: include/contact_selectors.php:56 mod/admin.php:862
+#: include/contact_selectors.php:56 mod/admin.php:887
 msgid "Frequently"
 msgstr "immer wieder"
 
-#: include/contact_selectors.php:57 mod/admin.php:863
+#: include/contact_selectors.php:57 mod/admin.php:888
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: include/contact_selectors.php:58 mod/admin.php:864
+#: include/contact_selectors.php:58 mod/admin.php:889
 msgid "Twice daily"
 msgstr "Zweimal täglich"
 
-#: include/contact_selectors.php:59 mod/admin.php:865
+#: include/contact_selectors.php:59 mod/admin.php:890
 msgid "Daily"
 msgstr "Täglich"
 
@@ -666,12 +537,12 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1367 mod/admin.php:1380 mod/admin.php:1392 mod/admin.php:1410
+#: mod/admin.php:1392 mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1436
 msgid "Email"
 msgstr "E-Mail"
 
 #: include/contact_selectors.php:80 mod/dfrn_request.php:869
-#: mod/settings.php:840
+#: mod/settings.php:842
 msgid "Diaspora"
 msgstr "Diaspora"
 
@@ -723,10 +594,6 @@ msgstr "App.net"
 msgid "Hubzilla/Redmatrix"
 msgstr "Hubzilla/Redmatrix"
 
-#: include/network.php:595
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
 #: include/acl_selectors.php:327
 msgid "Post to Email"
 msgstr "An E-Mail senden"
@@ -736,7 +603,7 @@ msgstr "An E-Mail senden"
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
 
-#: include/acl_selectors.php:333 mod/settings.php:1176
+#: include/acl_selectors.php:333 mod/settings.php:1181
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
@@ -745,12 +612,10 @@ msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
 #: include/acl_selectors.php:339 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "show"
 msgstr "zeigen"
 
 #: include/acl_selectors.php:340 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "don't show"
 msgstr "nicht zeigen"
 
@@ -773,25 +638,23 @@ msgstr "Schließen"
 
 #: include/like.php:163 include/conversation.php:130
 #: include/conversation.php:266 include/text.php:1808 mod/subthread.php:87
-#: mod/tagger.php:62 view/theme/diabook/theme.php:471
+#: mod/tagger.php:62
 msgid "photo"
 msgstr "Foto"
 
-#: include/like.php:163 include/diaspora.php:1402 include/conversation.php:125
+#: include/like.php:163 include/conversation.php:125
 #: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62
-#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475
+#: include/conversation.php:270 include/diaspora.php:1406 mod/subthread.php:87
+#: mod/tagger.php:62
 msgid "status"
 msgstr "Status"
 
 #: include/like.php:165 include/conversation.php:122
 #: include/conversation.php:258 include/text.php:1806
-#: view/theme/diabook/theme.php:463
 msgid "event"
 msgstr "Event"
 
-#: include/like.php:182 include/diaspora.php:1398 include/conversation.php:141
-#: view/theme/diabook/theme.php:480
+#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1402
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s"
@@ -820,9 +683,9 @@ msgstr "%1$s nimmt eventuell an %2$ss %3$s teil."
 msgid "[no subject]"
 msgstr "[kein Betreff]"
 
-#: include/message.php:145 include/Photo.php:1045 include/Photo.php:1061
-#: include/Photo.php:1069 include/Photo.php:1094 mod/wall_upload.php:218
-#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:477
+#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056
+#: include/Photo.php:1064 include/Photo.php:1089 mod/item.php:477
+#: mod/wall_upload.php:218 mod/wall_upload.php:232 mod/wall_upload.php:239
 msgid "Wall Photos"
 msgstr "Pinnwand-Bilder"
 
@@ -874,89 +737,6 @@ msgstr[1] "%d Kontakte nicht importiert"
 msgid "Done. You can now login with your username and password"
 msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"
 
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr "System"
-
-#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:402
-#: view/theme/frio/theme.php:253
-msgid "Network"
-msgstr "Netzwerk"
-
-#: include/NotificationsManager.php:167 mod/profiles.php:703
-#: mod/network.php:845
-msgid "Personal"
-msgstr "Persönlich"
-
-#: include/NotificationsManager.php:174 include/nav.php:105
-#: include/nav.php:161 view/theme/diabook/theme.php:123
-msgid "Home"
-msgstr "Pinnwand"
-
-#: include/NotificationsManager.php:181 include/nav.php:166
-msgid "Introductions"
-msgstr "Kontaktanfragen"
-
-#: include/NotificationsManager.php:234 include/NotificationsManager.php:245
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s hat %ss Beitrag kommentiert"
-
-#: include/NotificationsManager.php:244
-#, php-format
-msgid "%s created a new post"
-msgstr "%s hat einen neuen Beitrag erstellt"
-
-#: include/NotificationsManager.php:258
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s mag %ss Beitrag"
-
-#: include/NotificationsManager.php:269
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s mag %ss Beitrag nicht"
-
-#: include/NotificationsManager.php:280
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s nimmt an %s's Event teil"
-
-#: include/NotificationsManager.php:291
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s nimmt nicht an %s's Event teil"
-
-#: include/NotificationsManager.php:302
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s nimmt eventuell an %s's Event teil"
-
-#: include/NotificationsManager.php:317
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s ist jetzt mit %s befreundet"
-
-#: include/NotificationsManager.php:750
-msgid "Friend Suggestion"
-msgstr "Kontaktvorschlag"
-
-#: include/NotificationsManager.php:783
-msgid "Friend/Connect Request"
-msgstr "Kontakt-/Freundschaftsanfrage"
-
-#: include/NotificationsManager.php:783
-msgid "New Follower"
-msgstr "Neuer Bewunderer"
-
-#: include/diaspora.php:1954
-msgid "Sharing notification from Diaspora network"
-msgstr "Freigabe-Benachrichtigung von Diaspora"
-
-#: include/diaspora.php:2854
-msgid "Attachments:"
-msgstr "Anhänge:"
-
 #: include/features.php:63
 msgid "General Features"
 msgstr "Allgemeine Features"
@@ -1160,29 +940,6 @@ msgstr "Erweiterte Profil-Einstellungen"
 msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"
 
-#: include/delivery.php:439
-msgid "(no subject)"
-msgstr "(kein Betreff)"
-
-#: include/delivery.php:450 include/enotify.php:43
-msgid "noreply"
-msgstr "noreply"
-
-#: include/api.php:1019
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
-msgstr "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
-
-#: include/api.php:1039
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
-
-#: include/api.php:1060
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
-msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
-
 #: include/bbcode.php:348 include/bbcode.php:1055 include/bbcode.php:1056
 msgid "Image/photo"
 msgstr "Bild/Foto"
@@ -1200,419 +957,6 @@ msgstr "$1 hat geschrieben:"
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: include/conversation.php:147
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s teil."
-
-#: include/conversation.php:150
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s nimmt nicht an %2$ss %3$s teil."
-
-#: include/conversation.php:153
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s nimmt eventuell an %2$ss %3$s teil."
-
-#: include/conversation.php:185 mod/dfrn_confirm.php:473
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s ist nun mit %2$s befreundet"
-
-#: include/conversation.php:219
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s"
-
-#: include/conversation.php:239 mod/mood.php:62
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s ist momentan %2$s"
-
-#: include/conversation.php:278 mod/tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
-
-#: include/conversation.php:303
-msgid "post/item"
-msgstr "Nachricht/Beitrag"
-
-#: include/conversation.php:304
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
-#: mod/photos.php:1607
-msgid "Likes"
-msgstr "Likes"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
-#: mod/photos.php:1607
-msgid "Dislikes"
-msgstr "Dislikes"
-
-#: include/conversation.php:586 include/conversation.php:1477
-#: mod/content.php:373 mod/photos.php:1608
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Teilnehmend"
-msgstr[1] "Teilnehmend"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Not attending"
-msgstr "Nicht teilnehmend"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Might attend"
-msgstr "Eventuell teilnehmend"
-
-#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
-#: mod/photos.php:1681 object/Item.php:133
-msgid "Select"
-msgstr "Auswählen"
-
-#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/admin.php:1384 mod/contacts.php:808
-#: mod/contacts.php:1016 mod/photos.php:1682 mod/settings.php:739
-#: object/Item.php:134
-msgid "Delete"
-msgstr "Löschen"
-
-#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
-#: mod/content.php:911 object/Item.php:367 object/Item.php:368
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Das Profil von %s auf %s betrachten."
-
-#: include/conversation.php:765 object/Item.php:355
-msgid "Categories:"
-msgstr "Kategorien:"
-
-#: include/conversation.php:766 object/Item.php:356
-msgid "Filed under:"
-msgstr "Abgelegt unter:"
-
-#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
-#: object/Item.php:381
-#, php-format
-msgid "%s from %s"
-msgstr "%s von %s"
-
-#: include/conversation.php:789 mod/content.php:513
-msgid "View in context"
-msgstr "Im Zusammenhang betrachten"
-
-#: include/conversation.php:791 include/conversation.php:1261
-#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
-#: mod/message.php:548 mod/content.php:515 mod/content.php:948
-#: mod/photos.php:1570 object/Item.php:406
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: include/conversation.php:870
-msgid "remove"
-msgstr "löschen"
-
-#: include/conversation.php:874
-msgid "Delete Selected Items"
-msgstr "Lösche die markierten Beiträge"
-
-#: include/conversation.php:966
-msgid "Follow Thread"
-msgstr "Folge der Unterhaltung"
-
-#: include/conversation.php:967 include/Contact.php:390
-msgid "View Status"
-msgstr "Pinnwand anschauen"
-
-#: include/conversation.php:968 include/conversation.php:984
-#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr "Profil anschauen"
-
-#: include/conversation.php:969 include/Contact.php:392
-msgid "View Photos"
-msgstr "Bilder anschauen"
-
-#: include/conversation.php:970 include/Contact.php:393
-msgid "Network Posts"
-msgstr "Netzwerkbeiträge"
-
-#: include/conversation.php:971 include/Contact.php:394
-msgid "View Contact"
-msgstr "Kontakt anzeigen"
-
-#: include/conversation.php:972 include/Contact.php:396
-msgid "Send PM"
-msgstr "Private Nachricht senden"
-
-#: include/conversation.php:976 include/Contact.php:397
-msgid "Poke"
-msgstr "Anstupsen"
-
-#: include/conversation.php:1094
-#, php-format
-msgid "%s likes this."
-msgstr "%s mag das."
-
-#: include/conversation.php:1097
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s mag das nicht."
-
-#: include/conversation.php:1100
-#, php-format
-msgid "%s attends."
-msgstr "%s nimmt teil."
-
-#: include/conversation.php:1103
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s nimmt nicht teil."
-
-#: include/conversation.php:1106
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s nimmt eventuell teil."
-
-#: include/conversation.php:1116
-msgid "and"
-msgstr "und"
-
-#: include/conversation.php:1122
-#, php-format
-msgid ", and %d other people"
-msgstr " und %d andere"
-
-#: include/conversation.php:1131
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d Personen</span> mögen das"
-
-#: include/conversation.php:1132
-#, php-format
-msgid "%s like this."
-msgstr "%s mögen das."
-
-#: include/conversation.php:1135
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht"
-
-#: include/conversation.php:1136
-#, php-format
-msgid "%s don't like this."
-msgstr "%s mögen dies nicht."
-
-#: include/conversation.php:1139
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span %1$s>%2$d Personen</span> nehmen teil"
-
-#: include/conversation.php:1140
-#, php-format
-msgid "%s attend."
-msgstr "%s nehmen teil."
-
-#: include/conversation.php:1143
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span %1$s>%2$d Personen</span> nehmen nicht teil"
-
-#: include/conversation.php:1144
-#, php-format
-msgid "%s don't attend."
-msgstr "%s nehmen nicht teil."
-
-#: include/conversation.php:1147
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span %1$s>%2$d Personen</span> nehmen eventuell teil"
-
-#: include/conversation.php:1148
-#, php-format
-msgid "%s anttend maybe."
-msgstr "%s  nehmen vielleicht teil."
-
-#: include/conversation.php:1187 include/conversation.php:1205
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Für <strong>jedermann</strong> sichtbar"
-
-#: include/conversation.php:1188 include/conversation.php:1206
-#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
-#: mod/message.php:299 mod/message.php:442 mod/message.php:450
-msgid "Please enter a link URL:"
-msgstr "Bitte gib die URL des Links ein:"
-
-#: include/conversation.php:1189 include/conversation.php:1207
-msgid "Please enter a video link/URL:"
-msgstr "Bitte Link/URL zum Video einfügen:"
-
-#: include/conversation.php:1190 include/conversation.php:1208
-msgid "Please enter an audio link/URL:"
-msgstr "Bitte Link/URL zum Audio einfügen:"
-
-#: include/conversation.php:1191 include/conversation.php:1209
-msgid "Tag term:"
-msgstr "Tag:"
-
-#: include/conversation.php:1192 include/conversation.php:1210
-#: mod/filer.php:30
-msgid "Save to Folder:"
-msgstr "In diesem Ordner speichern:"
-
-#: include/conversation.php:1193 include/conversation.php:1211
-msgid "Where are you right now?"
-msgstr "Wo hältst Du Dich jetzt gerade auf?"
-
-#: include/conversation.php:1194
-msgid "Delete item(s)?"
-msgstr "Einträge löschen?"
-
-#: include/conversation.php:1242 mod/photos.php:1569
-msgid "Share"
-msgstr "Teilen"
-
-#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
-#: mod/message.php:354 mod/message.php:545
-msgid "Upload photo"
-msgstr "Foto hochladen"
-
-#: include/conversation.php:1244 mod/editpost.php:111
-msgid "upload photo"
-msgstr "Bild hochladen"
-
-#: include/conversation.php:1245 mod/editpost.php:112
-msgid "Attach file"
-msgstr "Datei anhängen"
-
-#: include/conversation.php:1246 mod/editpost.php:113
-msgid "attach file"
-msgstr "Datei anhängen"
-
-#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
-#: mod/message.php:355 mod/message.php:546
-msgid "Insert web link"
-msgstr "Einen Link einfügen"
-
-#: include/conversation.php:1248 mod/editpost.php:115
-msgid "web link"
-msgstr "Weblink"
-
-#: include/conversation.php:1249 mod/editpost.php:116
-msgid "Insert video link"
-msgstr "Video-Adresse einfügen"
-
-#: include/conversation.php:1250 mod/editpost.php:117
-msgid "video link"
-msgstr "Video-Link"
-
-#: include/conversation.php:1251 mod/editpost.php:118
-msgid "Insert audio link"
-msgstr "Audio-Adresse einfügen"
-
-#: include/conversation.php:1252 mod/editpost.php:119
-msgid "audio link"
-msgstr "Audio-Link"
-
-#: include/conversation.php:1253 mod/editpost.php:120
-msgid "Set your location"
-msgstr "Deinen Standort festlegen"
-
-#: include/conversation.php:1254 mod/editpost.php:121
-msgid "set location"
-msgstr "Ort setzen"
-
-#: include/conversation.php:1255 mod/editpost.php:122
-msgid "Clear browser location"
-msgstr "Browser-Standort leeren"
-
-#: include/conversation.php:1256 mod/editpost.php:123
-msgid "clear location"
-msgstr "Ort löschen"
-
-#: include/conversation.php:1258 mod/editpost.php:137
-msgid "Set title"
-msgstr "Titel setzen"
-
-#: include/conversation.php:1260 mod/editpost.php:139
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (kommasepariert)"
-
-#: include/conversation.php:1262 mod/editpost.php:125
-msgid "Permission settings"
-msgstr "Berechtigungseinstellungen"
-
-#: include/conversation.php:1263 mod/editpost.php:154
-msgid "permissions"
-msgstr "Zugriffsrechte"
-
-#: include/conversation.php:1271 mod/editpost.php:134
-msgid "Public post"
-msgstr "Öffentlicher Beitrag"
-
-#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
-#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
-#: mod/photos.php:1725 object/Item.php:729
-msgid "Preview"
-msgstr "Vorschau"
-
-#: include/conversation.php:1280 include/items.php:1917 mod/fbrowser.php:101
-#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
-#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
-#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
-#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677
-#: mod/settings.php:703
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: include/conversation.php:1286
-msgid "Post to Groups"
-msgstr "Poste an Gruppe"
-
-#: include/conversation.php:1287
-msgid "Post to Contacts"
-msgstr "Poste an Kontakte"
-
-#: include/conversation.php:1288
-msgid "Private post"
-msgstr "Privater Beitrag"
-
-#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
-msgid "Message"
-msgstr "Nachricht"
-
-#: include/conversation.php:1294 mod/editpost.php:153
-msgid "Browser"
-msgstr "Browser"
-
-#: include/conversation.php:1449
-msgid "View all"
-msgstr "Zeige alle"
-
-#: include/conversation.php:1471
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "mag ich"
-msgstr[1] "Mag ich"
-
-#: include/conversation.php:1474
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "mag ich nicht"
-msgstr[1] "Mag ich nicht"
-
-#: include/conversation.php:1480
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Nicht teilnehmend "
-msgstr[1] "Nicht teilnehmend"
-
 #: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
@@ -1711,36 +1055,6 @@ msgstr "%ss Geburtstag"
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
 
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
-
-#: include/dbstructure.php:183
-msgid "Errors encountered creating database tables."
-msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
-
-#: include/dbstructure.php:260
-msgid "Errors encountered performing database changes."
-msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."
-
-#: include/dfrn.php:1107
-#, php-format
-msgid "%s\\'s birthday"
-msgstr "%ss Geburtstag"
-
 #: include/enotify.php:24
 msgid "Friendica Notification"
 msgstr "Friendica-Benachrichtigung"
@@ -1759,6 +1073,10 @@ msgstr "der Administrator von %s"
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrator"
 
+#: include/enotify.php:43 include/delivery.php:457
+msgid "noreply"
+msgstr "noreply"
+
 #: include/enotify.php:70
 #, php-format
 msgid "%s <!item_type!>"
@@ -2062,11 +1380,11 @@ msgstr "Fr"
 msgid "Sat"
 msgstr "Sa"
 
-#: include/event.php:448 include/text.php:1130 mod/settings.php:968
+#: include/event.php:448 include/text.php:1130 mod/settings.php:972
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/event.php:449 include/text.php:1130 mod/settings.php:968
+#: include/event.php:449 include/text.php:1130 mod/settings.php:972
 msgid "Monday"
 msgstr "Montag"
 
@@ -2277,6 +1595,874 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
+#: include/nav.php:35 mod/navigation.php:19
+msgid "Nothing new here"
+msgstr "Keine Neuigkeiten"
+
+#: include/nav.php:39 mod/navigation.php:23
+msgid "Clear notifications"
+msgstr "Bereinige Benachrichtigungen"
+
+#: include/nav.php:40 include/text.php:1015
+msgid "@name, !forum, #tags, content"
+msgstr "@name, !forum, #tags, content"
+
+#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1787
+msgid "Logout"
+msgstr "Abmelden"
+
+#: include/nav.php:78 view/theme/frio/theme.php:243
+msgid "End this session"
+msgstr "Diese Sitzung beenden"
+
+#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637
+#: mod/contacts.php:833 view/theme/frio/theme.php:246
+msgid "Status"
+msgstr "Status"
+
+#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
+
+#: include/nav.php:82 include/identity.php:605 include/identity.php:691
+#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32
+#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
+msgid "Profile"
+msgstr "Profil"
+
+#: include/nav.php:82 view/theme/frio/theme.php:247
+msgid "Your profile page"
+msgstr "Deine Profilseite"
+
+#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32
+#: view/theme/frio/theme.php:248
+msgid "Photos"
+msgstr "Bilder"
+
+#: include/nav.php:83 view/theme/frio/theme.php:248
+msgid "Your photos"
+msgstr "Deine Fotos"
+
+#: include/nav.php:84 include/identity.php:738 include/identity.php:741
+#: view/theme/frio/theme.php:249
+msgid "Videos"
+msgstr "Videos"
+
+#: include/nav.php:84 view/theme/frio/theme.php:249
+msgid "Your videos"
+msgstr "Deine Videos"
+
+#: include/nav.php:85 include/nav.php:149 include/identity.php:750
+#: include/identity.php:761 mod/cal.php:275 mod/events.php:379
+#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
+msgid "Events"
+msgstr "Veranstaltungen"
+
+#: include/nav.php:85 view/theme/frio/theme.php:250
+msgid "Your events"
+msgstr "Deine Ereignisse"
+
+#: include/nav.php:86
+msgid "Personal notes"
+msgstr "Persönliche Notizen"
+
+#: include/nav.php:86
+msgid "Your personal notes"
+msgstr "Deine persönlichen Notizen"
+
+#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1788
+msgid "Login"
+msgstr "Anmeldung"
+
+#: include/nav.php:95
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: include/nav.php:105 include/nav.php:161
+#: include/NotificationsManager.php:174
+msgid "Home"
+msgstr "Pinnwand"
+
+#: include/nav.php:105
+msgid "Home Page"
+msgstr "Homepage"
+
+#: include/nav.php:109 mod/register.php:289 boot.php:1763
+msgid "Register"
+msgstr "Registrieren"
+
+#: include/nav.php:109
+msgid "Create an account"
+msgstr "Nutzerkonto erstellen"
+
+#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
+msgid "Help"
+msgstr "Hilfe"
+
+#: include/nav.php:115
+msgid "Help and documentation"
+msgstr "Hilfe und Dokumentation"
+
+#: include/nav.php:119
+msgid "Apps"
+msgstr "Apps"
+
+#: include/nav.php:119
+msgid "Addon applications, utilities, games"
+msgstr "Addon Anwendungen, Dienstprogramme, Spiele"
+
+#: include/nav.php:123 include/text.php:1012 mod/search.php:149
+msgid "Search"
+msgstr "Suche"
+
+#: include/nav.php:123
+msgid "Search site content"
+msgstr "Inhalt der Seite durchsuchen"
+
+#: include/nav.php:126 include/text.php:1020
+msgid "Full Text"
+msgstr "Volltext"
+
+#: include/nav.php:127 include/text.php:1021
+msgid "Tags"
+msgstr "Tags"
+
+#: include/nav.php:128 include/nav.php:192 include/identity.php:783
+#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792
+#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: include/nav.php:143 include/nav.php:145 mod/community.php:36
+msgid "Community"
+msgstr "Gemeinschaft"
+
+#: include/nav.php:143
+msgid "Conversations on this site"
+msgstr "Unterhaltungen auf dieser Seite"
+
+#: include/nav.php:145
+msgid "Conversations on the network"
+msgstr "Unterhaltungen im Netzwerk"
+
+#: include/nav.php:149 include/identity.php:753 include/identity.php:764
+#: view/theme/frio/theme.php:254
+msgid "Events and Calendar"
+msgstr "Ereignisse und Kalender"
+
+#: include/nav.php:152
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: include/nav.php:152
+msgid "People directory"
+msgstr "Nutzerverzeichnis"
+
+#: include/nav.php:154
+msgid "Information"
+msgstr "Information"
+
+#: include/nav.php:154
+msgid "Information about this friendica instance"
+msgstr "Informationen zu dieser Friendica Instanz"
+
+#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411
+#: view/theme/frio/theme.php:253
+msgid "Network"
+msgstr "Netzwerk"
+
+#: include/nav.php:158 view/theme/frio/theme.php:253
+msgid "Conversations from your friends"
+msgstr "Unterhaltungen Deiner Kontakte"
+
+#: include/nav.php:159
+msgid "Network Reset"
+msgstr "Netzwerk zurücksetzen"
+
+#: include/nav.php:159
+msgid "Load Network page with no filters"
+msgstr "Netzwerk-Seite ohne Filter laden"
+
+#: include/nav.php:166 include/NotificationsManager.php:181
+msgid "Introductions"
+msgstr "Kontaktanfragen"
+
+#: include/nav.php:166
+msgid "Friend Requests"
+msgstr "Kontaktanfragen"
+
+#: include/nav.php:169 mod/notifications.php:96
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: include/nav.php:170
+msgid "See all notifications"
+msgstr "Alle Benachrichtigungen anzeigen"
+
+#: include/nav.php:171 mod/settings.php:902
+msgid "Mark as seen"
+msgstr "Als gelesen markieren"
+
+#: include/nav.php:171
+msgid "Mark all system notifications seen"
+msgstr "Markiere alle Systembenachrichtigungen als gelesen"
+
+#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
+msgid "Messages"
+msgstr "Nachrichten"
+
+#: include/nav.php:175 view/theme/frio/theme.php:255
+msgid "Private mail"
+msgstr "Private E-Mail"
+
+#: include/nav.php:176
+msgid "Inbox"
+msgstr "Eingang"
+
+#: include/nav.php:177
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: include/nav.php:178 mod/message.php:16
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: include/nav.php:181
+msgid "Manage"
+msgstr "Verwalten"
+
+#: include/nav.php:181
+msgid "Manage other pages"
+msgstr "Andere Seiten verwalten"
+
+#: include/nav.php:184 mod/settings.php:81
+msgid "Delegations"
+msgstr "Delegationen"
+
+#: include/nav.php:184 mod/delegate.php:130
+msgid "Delegate Page Management"
+msgstr "Delegiere das Management für die Seite"
+
+#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1520
+#: mod/admin.php:1778 mod/settings.php:111 view/theme/frio/theme.php:256
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: include/nav.php:186 view/theme/frio/theme.php:256
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: include/nav.php:189 include/identity.php:282
+msgid "Profiles"
+msgstr "Profile"
+
+#: include/nav.php:189
+msgid "Manage/Edit Profiles"
+msgstr "Profile Verwalten/Editieren"
+
+#: include/nav.php:192 view/theme/frio/theme.php:257
+msgid "Manage/edit friends and contacts"
+msgstr " Kontakte verwalten/editieren"
+
+#: include/nav.php:197 mod/admin.php:186
+msgid "Admin"
+msgstr "Administration"
+
+#: include/nav.php:197
+msgid "Site setup and configuration"
+msgstr "Einstellungen der Seite und Konfiguration"
+
+#: include/nav.php:200
+msgid "Navigation"
+msgstr "Navigation"
+
+#: include/nav.php:200
+msgid "Site map"
+msgstr "Sitemap"
+
+#: include/oembed.php:252
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
+
+#: include/oembed.php:260
+msgid "Embedding disabled"
+msgstr "Einbettungen deaktiviert"
+
+#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
+#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
+#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
+msgid "Contact Photos"
+msgstr "Kontaktbilder"
+
+#: include/security.php:22
+msgid "Welcome "
+msgstr "Willkommen "
+
+#: include/security.php:23
+msgid "Please upload a profile photo."
+msgstr "Bitte lade ein Profilbild hoch."
+
+#: include/security.php:26
+msgid "Welcome back "
+msgstr "Willkommen zurück "
+
+#: include/security.php:373
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
+
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr "wird nicht mehr gefolgt"
+
+#: include/Contact.php:361 include/Contact.php:374 include/Contact.php:419
+#: include/conversation.php:968 include/conversation.php:984
+#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
+#: mod/match.php:71 mod/suggest.php:82
+msgid "View Profile"
+msgstr "Profil anschauen"
+
+#: include/Contact.php:418 include/conversation.php:967
+msgid "View Status"
+msgstr "Pinnwand anschauen"
+
+#: include/Contact.php:420 include/conversation.php:969
+msgid "View Photos"
+msgstr "Bilder anschauen"
+
+#: include/Contact.php:421 include/conversation.php:970
+msgid "Network Posts"
+msgstr "Netzwerkbeiträge"
+
+#: include/Contact.php:422 include/conversation.php:971
+msgid "View Contact"
+msgstr "Kontakt anzeigen"
+
+#: include/Contact.php:423
+msgid "Drop Contact"
+msgstr "Kontakt löschen"
+
+#: include/Contact.php:424 include/conversation.php:972
+msgid "Send PM"
+msgstr "Private Nachricht senden"
+
+#: include/Contact.php:425 include/conversation.php:976
+msgid "Poke"
+msgstr "Anstupsen"
+
+#: include/Contact.php:798
+msgid "Organisation"
+msgstr "Organisation"
+
+#: include/Contact.php:801
+msgid "News"
+msgstr "Nachrichten"
+
+#: include/Contact.php:804
+msgid "Forum"
+msgstr "Forum"
+
+#: include/NotificationsManager.php:153
+msgid "System"
+msgstr "System"
+
+#: include/NotificationsManager.php:167 mod/profiles.php:703
+#: mod/network.php:846
+msgid "Personal"
+msgstr "Persönlich"
+
+#: include/NotificationsManager.php:234 include/NotificationsManager.php:244
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s hat %ss Beitrag kommentiert"
+
+#: include/NotificationsManager.php:243
+#, php-format
+msgid "%s created a new post"
+msgstr "%s hat einen neuen Beitrag erstellt"
+
+#: include/NotificationsManager.php:256
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s mag %ss Beitrag"
+
+#: include/NotificationsManager.php:267
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s mag %ss Beitrag nicht"
+
+#: include/NotificationsManager.php:278
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s nimmt an %s's Event teil"
+
+#: include/NotificationsManager.php:289
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s nimmt nicht an %s's Event teil"
+
+#: include/NotificationsManager.php:300
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s nimmt eventuell an %s's Event teil"
+
+#: include/NotificationsManager.php:315
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s ist jetzt mit %s befreundet"
+
+#: include/NotificationsManager.php:748
+msgid "Friend Suggestion"
+msgstr "Kontaktvorschlag"
+
+#: include/NotificationsManager.php:781
+msgid "Friend/Connect Request"
+msgstr "Kontakt-/Freundschaftsanfrage"
+
+#: include/NotificationsManager.php:781
+msgid "New Follower"
+msgstr "Neuer Bewunderer"
+
+#: include/api.php:1018
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
+msgstr "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
+
+#: include/api.php:1038
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
+msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
+
+#: include/api.php:1059
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
+msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."
+
+#: include/conversation.php:147
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s teil."
+
+#: include/conversation.php:150
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s nimmt nicht an %2$ss %3$s teil."
+
+#: include/conversation.php:153
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s nimmt eventuell an %2$ss %3$s teil."
+
+#: include/conversation.php:185 mod/dfrn_confirm.php:473
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s ist nun mit %2$s befreundet"
+
+#: include/conversation.php:219
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s stupste %2$s"
+
+#: include/conversation.php:239 mod/mood.php:62
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s ist momentan %2$s"
+
+#: include/conversation.php:278 mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
+
+#: include/conversation.php:303
+msgid "post/item"
+msgstr "Nachricht/Beitrag"
+
+#: include/conversation.php:304
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
+#: mod/photos.php:1607
+msgid "Likes"
+msgstr "Likes"
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
+#: mod/photos.php:1607
+msgid "Dislikes"
+msgstr "Dislikes"
+
+#: include/conversation.php:586 include/conversation.php:1477
+#: mod/content.php:373 mod/photos.php:1608
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Teilnehmend"
+msgstr[1] "Teilnehmend"
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Not attending"
+msgstr "Nicht teilnehmend"
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Might attend"
+msgstr "Eventuell teilnehmend"
+
+#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
+#: mod/photos.php:1681 object/Item.php:133
+msgid "Select"
+msgstr "Auswählen"
+
+#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
+#: mod/content.php:759 mod/contacts.php:808 mod/contacts.php:1016
+#: mod/admin.php:1410 mod/photos.php:1682 mod/settings.php:741
+#: object/Item.php:134
+msgid "Delete"
+msgstr "Löschen"
+
+#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
+#: mod/content.php:911 object/Item.php:367 object/Item.php:368
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Das Profil von %s auf %s betrachten."
+
+#: include/conversation.php:765 object/Item.php:355
+msgid "Categories:"
+msgstr "Kategorien:"
+
+#: include/conversation.php:766 object/Item.php:356
+msgid "Filed under:"
+msgstr "Abgelegt unter:"
+
+#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
+#: object/Item.php:381
+#, php-format
+msgid "%s from %s"
+msgstr "%s von %s"
+
+#: include/conversation.php:789 mod/content.php:513
+msgid "View in context"
+msgstr "Im Zusammenhang betrachten"
+
+#: include/conversation.php:791 include/conversation.php:1261
+#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
+#: mod/message.php:548 mod/content.php:515 mod/content.php:948
+#: mod/photos.php:1570 object/Item.php:406
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: include/conversation.php:870
+msgid "remove"
+msgstr "löschen"
+
+#: include/conversation.php:874
+msgid "Delete Selected Items"
+msgstr "Lösche die markierten Beiträge"
+
+#: include/conversation.php:966
+msgid "Follow Thread"
+msgstr "Folge der Unterhaltung"
+
+#: include/conversation.php:1094
+#, php-format
+msgid "%s likes this."
+msgstr "%s mag das."
+
+#: include/conversation.php:1097
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s mag das nicht."
+
+#: include/conversation.php:1100
+#, php-format
+msgid "%s attends."
+msgstr "%s nimmt teil."
+
+#: include/conversation.php:1103
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s nimmt nicht teil."
+
+#: include/conversation.php:1106
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s nimmt eventuell teil."
+
+#: include/conversation.php:1116
+msgid "and"
+msgstr "und"
+
+#: include/conversation.php:1122
+#, php-format
+msgid ", and %d other people"
+msgstr " und %d andere"
+
+#: include/conversation.php:1131
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d Personen</span> mögen das"
+
+#: include/conversation.php:1132
+#, php-format
+msgid "%s like this."
+msgstr "%s mögen das."
+
+#: include/conversation.php:1135
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht"
+
+#: include/conversation.php:1136
+#, php-format
+msgid "%s don't like this."
+msgstr "%s mögen dies nicht."
+
+#: include/conversation.php:1139
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span %1$s>%2$d Personen</span> nehmen teil"
+
+#: include/conversation.php:1140
+#, php-format
+msgid "%s attend."
+msgstr "%s nehmen teil."
+
+#: include/conversation.php:1143
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span %1$s>%2$d Personen</span> nehmen nicht teil"
+
+#: include/conversation.php:1144
+#, php-format
+msgid "%s don't attend."
+msgstr "%s nehmen nicht teil."
+
+#: include/conversation.php:1147
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span %1$s>%2$d Personen</span> nehmen eventuell teil"
+
+#: include/conversation.php:1148
+#, php-format
+msgid "%s anttend maybe."
+msgstr "%s  nehmen vielleicht teil."
+
+#: include/conversation.php:1187 include/conversation.php:1205
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Für <strong>jedermann</strong> sichtbar"
+
+#: include/conversation.php:1188 include/conversation.php:1206
+#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
+#: mod/message.php:299 mod/message.php:442 mod/message.php:450
+msgid "Please enter a link URL:"
+msgstr "Bitte gib die URL des Links ein:"
+
+#: include/conversation.php:1189 include/conversation.php:1207
+msgid "Please enter a video link/URL:"
+msgstr "Bitte Link/URL zum Video einfügen:"
+
+#: include/conversation.php:1190 include/conversation.php:1208
+msgid "Please enter an audio link/URL:"
+msgstr "Bitte Link/URL zum Audio einfügen:"
+
+#: include/conversation.php:1191 include/conversation.php:1209
+msgid "Tag term:"
+msgstr "Tag:"
+
+#: include/conversation.php:1192 include/conversation.php:1210
+#: mod/filer.php:30
+msgid "Save to Folder:"
+msgstr "In diesem Ordner speichern:"
+
+#: include/conversation.php:1193 include/conversation.php:1211
+msgid "Where are you right now?"
+msgstr "Wo hältst Du Dich jetzt gerade auf?"
+
+#: include/conversation.php:1194
+msgid "Delete item(s)?"
+msgstr "Einträge löschen?"
+
+#: include/conversation.php:1242 mod/photos.php:1569
+msgid "Share"
+msgstr "Teilen"
+
+#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
+#: mod/message.php:354 mod/message.php:545
+msgid "Upload photo"
+msgstr "Foto hochladen"
+
+#: include/conversation.php:1244 mod/editpost.php:111
+msgid "upload photo"
+msgstr "Bild hochladen"
+
+#: include/conversation.php:1245 mod/editpost.php:112
+msgid "Attach file"
+msgstr "Datei anhängen"
+
+#: include/conversation.php:1246 mod/editpost.php:113
+msgid "attach file"
+msgstr "Datei anhängen"
+
+#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
+#: mod/message.php:355 mod/message.php:546
+msgid "Insert web link"
+msgstr "Einen Link einfügen"
+
+#: include/conversation.php:1248 mod/editpost.php:115
+msgid "web link"
+msgstr "Weblink"
+
+#: include/conversation.php:1249 mod/editpost.php:116
+msgid "Insert video link"
+msgstr "Video-Adresse einfügen"
+
+#: include/conversation.php:1250 mod/editpost.php:117
+msgid "video link"
+msgstr "Video-Link"
+
+#: include/conversation.php:1251 mod/editpost.php:118
+msgid "Insert audio link"
+msgstr "Audio-Adresse einfügen"
+
+#: include/conversation.php:1252 mod/editpost.php:119
+msgid "audio link"
+msgstr "Audio-Link"
+
+#: include/conversation.php:1253 mod/editpost.php:120
+msgid "Set your location"
+msgstr "Deinen Standort festlegen"
+
+#: include/conversation.php:1254 mod/editpost.php:121
+msgid "set location"
+msgstr "Ort setzen"
+
+#: include/conversation.php:1255 mod/editpost.php:122
+msgid "Clear browser location"
+msgstr "Browser-Standort leeren"
+
+#: include/conversation.php:1256 mod/editpost.php:123
+msgid "clear location"
+msgstr "Ort löschen"
+
+#: include/conversation.php:1258 mod/editpost.php:137
+msgid "Set title"
+msgstr "Titel setzen"
+
+#: include/conversation.php:1260 mod/editpost.php:139
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (kommasepariert)"
+
+#: include/conversation.php:1262 mod/editpost.php:125
+msgid "Permission settings"
+msgstr "Berechtigungseinstellungen"
+
+#: include/conversation.php:1263 mod/editpost.php:154
+msgid "permissions"
+msgstr "Zugriffsrechte"
+
+#: include/conversation.php:1271 mod/editpost.php:134
+msgid "Public post"
+msgstr "Öffentlicher Beitrag"
+
+#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
+#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
+#: mod/photos.php:1725 object/Item.php:729
+msgid "Preview"
+msgstr "Vorschau"
+
+#: include/conversation.php:1280 include/items.php:1952 mod/fbrowser.php:101
+#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
+#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
+#: mod/contacts.php:445 mod/suggest.php:32 mod/photos.php:235
+#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705
+#: mod/videos.php:128
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: include/conversation.php:1286
+msgid "Post to Groups"
+msgstr "Poste an Gruppe"
+
+#: include/conversation.php:1287
+msgid "Post to Contacts"
+msgstr "Poste an Kontakte"
+
+#: include/conversation.php:1288
+msgid "Private post"
+msgstr "Privater Beitrag"
+
+#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
+msgid "Message"
+msgstr "Nachricht"
+
+#: include/conversation.php:1294 mod/editpost.php:153
+msgid "Browser"
+msgstr "Browser"
+
+#: include/conversation.php:1449
+msgid "View all"
+msgstr "Zeige alle"
+
+#: include/conversation.php:1471
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "mag ich"
+msgstr[1] "Mag ich"
+
+#: include/conversation.php:1474
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "mag ich nicht"
+msgstr[1] "Mag ich nicht"
+
+#: include/conversation.php:1480
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Nicht teilnehmend "
+msgstr[1] "Nicht teilnehmend"
+
+#: include/dbstructure.php:26
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
+
+#: include/dbstructure.php:31
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
+
+#: include/dbstructure.php:183
+msgid "Errors encountered creating database tables."
+msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
+
+#: include/dbstructure.php:260
+msgid "Errors encountered performing database changes."
+msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."
+
+#: include/delivery.php:446
+msgid "(no subject)"
+msgstr "(kein Betreff)"
+
+#: include/dfrn.php:1107
+#, php-format
+msgid "%s\\'s birthday"
+msgstr "%ss Geburtstag"
+
+#: include/diaspora.php:1958
+msgid "Sharing notification from Diaspora network"
+msgstr "Freigabe-Benachrichtigung von Diaspora"
+
+#: include/diaspora.php:2864
+msgid "Attachments:"
+msgstr "Anhänge:"
+
 #: include/identity.php:42
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
@@ -2293,10 +2479,6 @@ msgstr "Profil bearbeiten"
 msgid "Atom feed"
 msgstr "Atom-Feed"
 
-#: include/identity.php:282 include/nav.php:189
-msgid "Profiles"
-msgstr "Profile"
-
 #: include/identity.php:282
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
@@ -2379,14 +2561,7 @@ msgstr "Veranstaltungserinnerungen"
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: include/identity.php:605 include/identity.php:691 include/identity.php:722
-#: include/nav.php:82 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Profile"
-msgstr "Profil"
-
-#: include/identity.php:614 mod/settings.php:1274
+#: include/identity.php:614 mod/settings.php:1279
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
@@ -2480,16 +2655,11 @@ msgstr "Foren:"
 msgid "Basic"
 msgstr "Allgemein"
 
-#: include/identity.php:693 mod/admin.php:931 mod/contacts.php:870
-#: mod/events.php:508
+#: include/identity.php:693 mod/contacts.php:870 mod/events.php:508
+#: mod/admin.php:956
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: include/identity.php:714 include/nav.php:81 mod/contacts.php:637
-#: mod/contacts.php:833 view/theme/frio/theme.php:246
-msgid "Status"
-msgstr "Status"
-
 #: include/identity.php:717 mod/follow.php:143 mod/contacts.php:836
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
@@ -2498,32 +2668,10 @@ msgstr "Statusnachrichten und Beiträge"
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: include/identity.php:730 include/nav.php:83 mod/fbrowser.php:32
-#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126
-msgid "Photos"
-msgstr "Bilder"
-
 #: include/identity.php:733 mod/photos.php:87
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: include/identity.php:738 include/identity.php:741 include/nav.php:84
-#: view/theme/frio/theme.php:249
-msgid "Videos"
-msgstr "Videos"
-
-#: include/identity.php:750 include/identity.php:761 include/nav.php:85
-#: include/nav.php:149 mod/cal.php:275 mod/events.php:379
-#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
-#: view/theme/diabook/theme.php:127
-msgid "Events"
-msgstr "Veranstaltungen"
-
-#: include/identity.php:753 include/identity.php:764 include/nav.php:149
-#: view/theme/frio/theme.php:254
-msgid "Events and Calendar"
-msgstr "Ereignisse und Kalender"
-
 #: include/identity.php:772 mod/notes.php:46
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
@@ -2532,41 +2680,33 @@ msgstr "Persönliche Notizen"
 msgid "Only You Can See This"
 msgstr "Nur Du kannst das sehen"
 
-#: include/identity.php:783 include/identity.php:786 include/nav.php:128
-#: include/nav.php:192 include/text.php:1022 mod/contacts.php:792
-#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
-#: view/theme/diabook/theme.php:125
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: include/items.php:1518 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
+#: include/items.php:1553 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
-#: include/items.php:1873 mod/viewsrc.php:15 mod/notice.php:15
-#: mod/admin.php:234 mod/admin.php:1441 mod/admin.php:1675 mod/display.php:103
-#: mod/display.php:279 mod/display.php:478
+#: include/items.php:1908 mod/viewsrc.php:15 mod/notice.php:15
+#: mod/display.php:103 mod/display.php:279 mod/display.php:478
+#: mod/admin.php:234 mod/admin.php:1467 mod/admin.php:1701
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
-#: include/items.php:1912
+#: include/items.php:1947
 msgid "Do you really want to delete this item?"
 msgstr "Möchtest Du wirklich dieses Item löschen?"
 
-#: include/items.php:1914 mod/follow.php:110 mod/api.php:105
+#: include/items.php:1949 mod/follow.php:110 mod/api.php:105
 #: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
 #: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
-#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158
-#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176
-#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193
-#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226
-#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229
+#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163
+#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
+#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
+#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
+#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
 msgid "Yes"
 msgstr "Ja"
 
-#: include/items.php:2077 mod/wall_upload.php:77 mod/wall_upload.php:80
-#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15
-#: mod/invite.php:101 mod/wall_attach.php:67 mod/wall_attach.php:70
+#: include/items.php:2112 mod/notes.php:22 mod/uimport.php:23
+#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101
 #: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33
 #: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/editpost.php:10
 #: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33
@@ -2579,284 +2719,22 @@ msgstr "Ja"
 #: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605
 #: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18
 #: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
-#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
-#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22
-#: mod/settings.php:128 mod/settings.php:663 index.php:397
+#: mod/events.php:190 mod/suggest.php:58 mod/item.php:198 mod/item.php:210
+#: mod/network.php:4 mod/photos.php:159 mod/photos.php:1072
+#: mod/register.php:42 mod/settings.php:22 mod/settings.php:128
+#: mod/settings.php:665 mod/viewcontacts.php:45 mod/wall_attach.php:67
+#: mod/wall_attach.php:70 mod/wall_upload.php:77 mod/wall_upload.php:80
+#: index.php:397
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
-#: include/items.php:2182
+#: include/items.php:2217
 msgid "Archives"
 msgstr "Archiv"
 
-#: include/nav.php:35 mod/navigation.php:19
-msgid "Nothing new here"
-msgstr "Keine Neuigkeiten"
-
-#: include/nav.php:39 mod/navigation.php:23
-msgid "Clear notifications"
-msgstr "Bereinige Benachrichtigungen"
-
-#: include/nav.php:40 include/text.php:1015
-msgid "@name, !forum, #tags, content"
-msgstr "@name, !forum, #tags, content"
-
-#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1778
-msgid "Logout"
-msgstr "Abmelden"
-
-#: include/nav.php:78 view/theme/frio/theme.php:243
-msgid "End this session"
-msgstr "Diese Sitzung beenden"
-
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
-#: view/theme/diabook/theme.php:123
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: include/nav.php:82 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: include/nav.php:83 view/theme/frio/theme.php:248
-#: view/theme/diabook/theme.php:126
-msgid "Your photos"
-msgstr "Deine Fotos"
-
-#: include/nav.php:84 view/theme/frio/theme.php:249
-msgid "Your videos"
-msgstr "Deine Videos"
-
-#: include/nav.php:85 view/theme/frio/theme.php:250
-#: view/theme/diabook/theme.php:127
-msgid "Your events"
-msgstr "Deine Ereignisse"
-
-#: include/nav.php:86 view/theme/diabook/theme.php:128
-msgid "Personal notes"
-msgstr "Persönliche Notizen"
-
-#: include/nav.php:86
-msgid "Your personal notes"
-msgstr "Deine persönlichen Notizen"
-
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1779
-msgid "Login"
-msgstr "Anmeldung"
-
-#: include/nav.php:95
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: include/nav.php:105
-msgid "Home Page"
-msgstr "Homepage"
-
-#: include/nav.php:109 mod/register.php:280 boot.php:1754
-msgid "Register"
-msgstr "Registrieren"
-
-#: include/nav.php:109
-msgid "Create an account"
-msgstr "Nutzerkonto erstellen"
-
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
-msgid "Help"
-msgstr "Hilfe"
-
-#: include/nav.php:115
-msgid "Help and documentation"
-msgstr "Hilfe und Dokumentation"
-
-#: include/nav.php:119
-msgid "Apps"
-msgstr "Apps"
-
-#: include/nav.php:119
-msgid "Addon applications, utilities, games"
-msgstr "Addon Anwendungen, Dienstprogramme, Spiele"
-
-#: include/nav.php:123 include/text.php:1012 mod/search.php:149
-msgid "Search"
-msgstr "Suche"
-
-#: include/nav.php:123
-msgid "Search site content"
-msgstr "Inhalt der Seite durchsuchen"
-
-#: include/nav.php:126 include/text.php:1020
-msgid "Full Text"
-msgstr "Volltext"
-
-#: include/nav.php:127 include/text.php:1021
-msgid "Tags"
-msgstr "Tags"
-
-#: include/nav.php:143 include/nav.php:145 mod/community.php:36
-#: view/theme/diabook/theme.php:129
-msgid "Community"
-msgstr "Gemeinschaft"
-
-#: include/nav.php:143
-msgid "Conversations on this site"
-msgstr "Unterhaltungen auf dieser Seite"
-
-#: include/nav.php:145
-msgid "Conversations on the network"
-msgstr "Unterhaltungen im Netzwerk"
-
-#: include/nav.php:152
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: include/nav.php:152
-msgid "People directory"
-msgstr "Nutzerverzeichnis"
-
-#: include/nav.php:154
-msgid "Information"
-msgstr "Information"
-
-#: include/nav.php:154
-msgid "Information about this friendica instance"
-msgstr "Informationen zu dieser Friendica Instanz"
-
-#: include/nav.php:158 view/theme/frio/theme.php:253
-msgid "Conversations from your friends"
-msgstr "Unterhaltungen Deiner Kontakte"
-
-#: include/nav.php:159
-msgid "Network Reset"
-msgstr "Netzwerk zurücksetzen"
-
-#: include/nav.php:159
-msgid "Load Network page with no filters"
-msgstr "Netzwerk-Seite ohne Filter laden"
-
-#: include/nav.php:166
-msgid "Friend Requests"
-msgstr "Kontaktanfragen"
-
-#: include/nav.php:169 mod/notifications.php:96
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#: include/nav.php:170
-msgid "See all notifications"
-msgstr "Alle Benachrichtigungen anzeigen"
-
-#: include/nav.php:171 mod/settings.php:900
-msgid "Mark as seen"
-msgstr "Als gelesen markieren"
-
-#: include/nav.php:171
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle Systembenachrichtigungen als gelesen"
-
-#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: include/nav.php:175 view/theme/frio/theme.php:255
-msgid "Private mail"
-msgstr "Private E-Mail"
-
-#: include/nav.php:176
-msgid "Inbox"
-msgstr "Eingang"
-
-#: include/nav.php:177
-msgid "Outbox"
-msgstr "Ausgang"
-
-#: include/nav.php:178 mod/message.php:16
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: include/nav.php:181
-msgid "Manage"
-msgstr "Verwalten"
-
-#: include/nav.php:181
-msgid "Manage other pages"
-msgstr "Andere Seiten verwalten"
-
-#: include/nav.php:184 mod/settings.php:81
-msgid "Delegations"
-msgstr "Delegationen"
-
-#: include/nav.php:184 mod/delegate.php:130
-msgid "Delegate Page Management"
-msgstr "Delegiere das Management für die Seite"
-
-#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1494
-#: mod/admin.php:1752 mod/settings.php:111 view/theme/frio/theme.php:256
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: include/nav.php:186 view/theme/frio/theme.php:256
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: include/nav.php:189
-msgid "Manage/Edit Profiles"
-msgstr "Profile Verwalten/Editieren"
-
-#: include/nav.php:192 view/theme/frio/theme.php:257
-msgid "Manage/edit friends and contacts"
-msgstr " Kontakte verwalten/editieren"
-
-#: include/nav.php:197 mod/admin.php:186
-msgid "Admin"
-msgstr "Administration"
-
-#: include/nav.php:197
-msgid "Site setup and configuration"
-msgstr "Einstellungen der Seite und Konfiguration"
-
-#: include/nav.php:200
-msgid "Navigation"
-msgstr "Navigation"
-
-#: include/nav.php:200
-msgid "Site map"
-msgstr "Sitemap"
-
-#: include/oembed.php:252
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
-
-#: include/oembed.php:260
-msgid "Embedding disabled"
-msgstr "Einbettungen deaktiviert"
-
-#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
-#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
-#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
-#: view/theme/diabook/theme.php:499
-msgid "Contact Photos"
-msgstr "Kontaktbilder"
-
-#: include/security.php:22
-msgid "Welcome "
-msgstr "Willkommen "
-
-#: include/security.php:23
-msgid "Please upload a profile photo."
-msgstr "Bitte lade ein Profilbild hoch."
-
-#: include/security.php:26
-msgid "Welcome back "
-msgstr "Willkommen zurück "
-
-#: include/security.php:373
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
+#: include/network.php:595
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
 
 #: include/text.php:304
 msgid "newer"
@@ -3077,25 +2955,146 @@ msgstr "Beitrag"
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
-#: include/Contact.php:119
-msgid "stopped following"
-msgstr "wird nicht mehr gefolgt"
+#: include/user.php:39 mod/settings.php:373
+msgid "Passwords do not match. Password unchanged."
+msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: include/Contact.php:395
-msgid "Drop Contact"
-msgstr "Kontakt löschen"
+#: include/user.php:48
+msgid "An invitation is required."
+msgstr "Du benötigst eine Einladung."
 
-#: include/Contact.php:770
-msgid "Organisation"
-msgstr "Organisation"
+#: include/user.php:53
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: include/Contact.php:773
-msgid "News"
-msgstr "Nachrichten"
+#: include/user.php:61
+msgid "Invalid OpenID url"
+msgstr "Ungültige OpenID URL"
 
-#: include/Contact.php:776
-msgid "Forum"
-msgstr "Forum"
+#: include/user.php:82
+msgid "Please enter the required information."
+msgstr "Bitte trage die erforderlichen Informationen ein."
+
+#: include/user.php:96
+msgid "Please use a shorter name."
+msgstr "Bitte verwende einen kürzeren Namen."
+
+#: include/user.php:98
+msgid "Name too short."
+msgstr "Der Name ist zu kurz."
+
+#: include/user.php:113
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
+
+#: include/user.php:118
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
+
+#: include/user.php:121
+msgid "Not a valid email address."
+msgstr "Keine gültige E-Mail-Adresse."
+
+#: include/user.php:134
+msgid "Cannot use that email."
+msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
+
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
+
+#: include/user.php:147 include/user.php:245
+msgid "Nickname is already registered. Please choose another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
+
+#: include/user.php:157
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
+
+#: include/user.php:173
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
+
+#: include/user.php:231
+msgid "An error occurred during registration. Please try again."
+msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
+
+#: include/user.php:256 view/theme/duepuntozero/config.php:44
+msgid "default"
+msgstr "Standard"
+
+#: include/user.php:266
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
+
+#: include/user.php:345 include/user.php:352 include/user.php:359
+#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
+#: mod/profile_photo.php:210 mod/profile_photo.php:302
+#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
+#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
+#: mod/photos.php:1819
+msgid "Profile Photos"
+msgstr "Profilbilder"
+
+#: include/user.php:390
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\t"
+msgstr "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden."
+
+#: include/user.php:400
+#, php-format
+msgid "Registration at %s"
+msgstr "Registrierung als %s"
+
+#: include/user.php:410
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
+msgstr "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
+
+#: include/user.php:414
+#, php-format
+msgid ""
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$s\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\tthan that.\n"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
+msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
+
+#: include/user.php:446 mod/admin.php:1209
+#, php-format
+msgid "Registration details for %s"
+msgstr "Details der Registration von %s"
 
 #: mod/oexchange.php:25
 msgid "Post successful."
@@ -3242,7 +3241,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: mod/lostpass.php:109 boot.php:1793
+#: mod/lostpass.php:109 boot.php:1802
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -3308,7 +3307,7 @@ msgid ""
 "your email for further instructions."
 msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."
 
-#: mod/lostpass.php:161 boot.php:1781
+#: mod/lostpass.php:161 boot.php:1790
 msgid "Nickname or Email: "
 msgstr "Spitzname oder E-Mail:"
 
@@ -3333,25 +3332,6 @@ msgstr "Nicht gefunden"
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
-#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
-#: mod/wall_attach.php:25 mod/wall_attach.php:76
-msgid "Invalid request."
-msgstr "Ungültige Anfrage"
-
-#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:786
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Bildgröße überschreitet das Limit von %s"
-
-#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:826
-msgid "Unable to process image."
-msgstr "Konnte das Bild nicht bearbeiten."
-
-#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:853
-msgid "Image upload failed."
-msgstr "Hochladen des Bildes gescheitert."
-
 #: mod/lockview.php:31 mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
@@ -3369,13 +3349,13 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet."
 
-#: mod/uimport.php:50 mod/register.php:191
+#: mod/uimport.php:50 mod/register.php:198
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: mod/uimport.php:64 mod/register.php:286
+#: mod/uimport.php:64 mod/register.php:295
 msgid "Import"
 msgstr "Import"
 
@@ -3553,10 +3533,8 @@ msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es
 #: mod/install.php:272 mod/install.php:312 mod/photos.php:1104
 #: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590
 #: mod/photos.php:1638 mod/photos.php:1724 object/Item.php:720
-#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80
-#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70
-#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633
-#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59
+#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64
+#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
 msgid "Submit"
 msgstr "Senden"
 
@@ -3604,23 +3582,6 @@ msgstr "Wähle ein Tag zum Entfernen aus: "
 msgid "Remove"
 msgstr "Entfernen"
 
-#: mod/wall_attach.php:94
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."
-
-#: mod/wall_attach.php:94
-msgid "Or - did you try to upload an empty file?"
-msgstr "Oder - hast Du versucht, eine leere Datei hochzuladen?"
-
-#: mod/wall_attach.php:105
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Die Datei ist größer als das erlaubte Limit von %s"
-
-#: mod/wall_attach.php:156 mod/wall_attach.php:172
-msgid "File upload failed."
-msgstr "Hochladen der Datei fehlgeschlagen."
-
 #: mod/repair_ostatus.php:14
 msgid "Resubscribing to OStatus contacts"
 msgstr "Erneuern der OStatus Abonements"
@@ -3727,11 +3688,11 @@ msgstr "Kennt %s Dich?"
 
 #: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861
 #: mod/profiles.php:648 mod/profiles.php:652 mod/profiles.php:677
-#: mod/register.php:239 mod/settings.php:1158 mod/settings.php:1164
-#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181
-#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199
-#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227
-#: mod/settings.php:1228 mod/settings.php:1229
+#: mod/register.php:246 mod/settings.php:1163 mod/settings.php:1169
+#: mod/settings.php:1177 mod/settings.php:1181 mod/settings.php:1186
+#: mod/settings.php:1192 mod/settings.php:1198 mod/settings.php:1204
+#: mod/settings.php:1230 mod/settings.php:1231 mod/settings.php:1232
+#: mod/settings.php:1233 mod/settings.php:1234
 msgid "No"
 msgstr "Nein"
 
@@ -4035,7 +3996,7 @@ msgstr "Mitglieder"
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: mod/group.php:193 mod/content.php:130 mod/network.php:495
+#: mod/group.php:193 mod/content.php:130 mod/network.php:496
 msgid "Group is empty"
 msgstr "Gruppe ist leer"
 
@@ -4331,9 +4292,9 @@ msgid ""
 "entries from this contact."
 msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
 
-#: mod/crepair.php:165 mod/admin.php:1367 mod/admin.php:1380
-#: mod/admin.php:1392 mod/admin.php:1408 mod/settings.php:678
-#: mod/settings.php:704
+#: mod/crepair.php:165 mod/admin.php:1392 mod/admin.php:1405
+#: mod/admin.php:1418 mod/admin.php:1434 mod/settings.php:680
+#: mod/settings.php:706
 msgid "Name"
 msgstr "Name"
 
@@ -4519,11 +4480,11 @@ msgid ""
 " bar."
 msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."
 
-#: mod/content.php:119 mod/network.php:468
+#: mod/content.php:119 mod/network.php:469
 msgid "No such group"
 msgstr "Es gibt keine solche Gruppe"
 
-#: mod/content.php:135 mod/network.php:499
+#: mod/content.php:135 mod/network.php:500
 #, php-format
 msgid "Group: %s"
 msgstr "Gruppe: %s"
@@ -4574,7 +4535,7 @@ msgstr "Das bist Du"
 
 #: mod/content.php:727 mod/content.php:945 mod/photos.php:1589
 #: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403
-#: object/Item.php:719 boot.php:969
+#: object/Item.php:719 boot.php:970
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -4610,7 +4571,7 @@ msgstr "Link"
 msgid "Video"
 msgstr "Video"
 
-#: mod/content.php:746 mod/settings.php:738 object/Item.php:122
+#: mod/content.php:746 mod/settings.php:740 object/Item.php:122
 #: object/Item.php:124
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -4816,6 +4777,15 @@ msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
+#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr "Bildgröße überschreitet das Limit von %s"
+
+#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188
+msgid "Unable to process image."
+msgstr "Konnte das Bild nicht bearbeiten."
+
 #: mod/profile_photo.php:248
 msgid "Upload File:"
 msgstr "Datei hochladen:"
@@ -4856,6 +4826,10 @@ msgstr "Bearbeitung abgeschlossen"
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich hochgeladen."
 
+#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221
+msgid "Image upload failed."
+msgstr "Hochladen des Bildes gescheitert."
+
 #: mod/regmod.php:55
 msgid "Account approved."
 msgstr "Konto freigegeben."
@@ -4925,7 +4899,7 @@ msgstr "Neue-Kontakt Nachricht senden"
 msgid "if applicable"
 msgstr "falls anwendbar"
 
-#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1382
+#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1408
 msgid "Approve"
 msgstr "Genehmigen"
 
@@ -5287,1384 +5261,6 @@ msgstr "Kontaktinformationen und Soziale Netzwerke"
 msgid "Edit/Manage Profiles"
 msgstr "Bearbeite/Verwalte Profile"
 
-#: mod/admin.php:92
-msgid "Theme settings updated."
-msgstr "Themeneinstellungen aktualisiert."
-
-#: mod/admin.php:156 mod/admin.php:926
-msgid "Site"
-msgstr "Seite"
-
-#: mod/admin.php:157 mod/admin.php:870 mod/admin.php:1375 mod/admin.php:1390
-msgid "Users"
-msgstr "Nutzer"
-
-#: mod/admin.php:158 mod/admin.php:1492 mod/admin.php:1552 mod/settings.php:74
-msgid "Plugins"
-msgstr "Plugins"
-
-#: mod/admin.php:159 mod/admin.php:1750 mod/admin.php:1800
-msgid "Themes"
-msgstr "Themen"
-
-#: mod/admin.php:160 mod/settings.php:52
-msgid "Additional features"
-msgstr "Zusätzliche Features"
-
-#: mod/admin.php:161
-msgid "DB updates"
-msgstr "DB Updates"
-
-#: mod/admin.php:162 mod/admin.php:397
-msgid "Inspect Queue"
-msgstr "Warteschlange Inspizieren"
-
-#: mod/admin.php:163 mod/admin.php:363
-msgid "Federation Statistics"
-msgstr "Federation Statistik"
-
-#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1874
-msgid "Logs"
-msgstr "Protokolle"
-
-#: mod/admin.php:178 mod/admin.php:1942
-msgid "View Logs"
-msgstr "Protokolle anzeigen"
-
-#: mod/admin.php:179
-msgid "probe address"
-msgstr "Adresse untersuchen"
-
-#: mod/admin.php:180
-msgid "check webfinger"
-msgstr "Webfinger überprüfen"
-
-#: mod/admin.php:187
-msgid "Plugin Features"
-msgstr "Plugin Features"
-
-#: mod/admin.php:189
-msgid "diagnostics"
-msgstr "Diagnose"
-
-#: mod/admin.php:190
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzeranmeldungen die auf Bestätigung warten"
-
-#: mod/admin.php:356
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
-msgstr "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."
-
-#: mod/admin.php:357
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."
-
-#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:925
-#: mod/admin.php:1374 mod/admin.php:1491 mod/admin.php:1551 mod/admin.php:1749
-#: mod/admin.php:1799 mod/admin.php:1873 mod/admin.php:1941
-msgid "Administration"
-msgstr "Administration"
-
-#: mod/admin.php:369
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
-msgstr "Momentan kennt dieser Knoten %d andere Knoten der folgenden Plattformen:"
-
-#: mod/admin.php:399
-msgid "ID"
-msgstr "ID"
-
-#: mod/admin.php:400
-msgid "Recipient Name"
-msgstr "Empfänger Name"
-
-#: mod/admin.php:401
-msgid "Recipient Profile"
-msgstr "Empfänger Profil"
-
-#: mod/admin.php:403
-msgid "Created"
-msgstr "Erstellt"
-
-#: mod/admin.php:404
-msgid "Last Tried"
-msgstr "Zuletzt versucht"
-
-#: mod/admin.php:405
-msgid ""
-"This page lists the content of the queue for outgoing postings. These are "
-"postings the initial delivery failed for. They will be resend later and "
-"eventually deleted if the delivery fails permanently."
-msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
-
-#: mod/admin.php:424 mod/admin.php:1323
-msgid "Normal Account"
-msgstr "Normales Konto"
-
-#: mod/admin.php:425 mod/admin.php:1324
-msgid "Soapbox Account"
-msgstr "Marktschreier-Konto"
-
-#: mod/admin.php:426 mod/admin.php:1325
-msgid "Community/Celebrity Account"
-msgstr "Forum/Promi-Konto"
-
-#: mod/admin.php:427 mod/admin.php:1326
-msgid "Automatic Friend Account"
-msgstr "Automatisches Freundekonto"
-
-#: mod/admin.php:428
-msgid "Blog Account"
-msgstr "Blog-Konto"
-
-#: mod/admin.php:429
-msgid "Private Forum"
-msgstr "Privates Forum"
-
-#: mod/admin.php:455
-msgid "Message queues"
-msgstr "Nachrichten-Warteschlangen"
-
-#: mod/admin.php:461
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: mod/admin.php:464
-msgid "Registered users"
-msgstr "Registrierte Nutzer"
-
-#: mod/admin.php:466
-msgid "Pending registrations"
-msgstr "Anstehende Anmeldungen"
-
-#: mod/admin.php:467
-msgid "Version"
-msgstr "Version"
-
-#: mod/admin.php:472
-msgid "Active plugins"
-msgstr "Aktive Plugins"
-
-#: mod/admin.php:495
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen"
-
-#: mod/admin.php:798
-msgid "RINO2 needs mcrypt php extension to work."
-msgstr "RINO2 benötigt die PHP Extension mcrypt."
-
-#: mod/admin.php:806
-msgid "Site settings updated."
-msgstr "Seiteneinstellungen aktualisiert."
-
-#: mod/admin.php:834 mod/settings.php:932
-msgid "No special theme for mobile devices"
-msgstr "Kein spezielles Theme für mobile Geräte verwenden."
-
-#: mod/admin.php:853
-msgid "No community page"
-msgstr "Keine Gemeinschaftsseite"
-
-#: mod/admin.php:854
-msgid "Public postings from users of this site"
-msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite"
-
-#: mod/admin.php:855
-msgid "Global community page"
-msgstr "Globale Gemeinschaftsseite"
-
-#: mod/admin.php:860 mod/contacts.php:530
-msgid "Never"
-msgstr "Niemals"
-
-#: mod/admin.php:861
-msgid "At post arrival"
-msgstr "Beim Empfang von Nachrichten"
-
-#: mod/admin.php:869 mod/contacts.php:557
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: mod/admin.php:871
-msgid "Users, Global Contacts"
-msgstr "Nutzer, globale Kontakte"
-
-#: mod/admin.php:872
-msgid "Users, Global Contacts/fallback"
-msgstr "Nutzer, globale Kontakte / Fallback"
-
-#: mod/admin.php:876
-msgid "One month"
-msgstr "ein Monat"
-
-#: mod/admin.php:877
-msgid "Three months"
-msgstr "drei Monate"
-
-#: mod/admin.php:878
-msgid "Half a year"
-msgstr "ein halbes Jahr"
-
-#: mod/admin.php:879
-msgid "One year"
-msgstr "ein Jahr"
-
-#: mod/admin.php:884
-msgid "Multi user instance"
-msgstr "Mehrbenutzer Instanz"
-
-#: mod/admin.php:907
-msgid "Closed"
-msgstr "Geschlossen"
-
-#: mod/admin.php:908
-msgid "Requires approval"
-msgstr "Bedarf der Zustimmung"
-
-#: mod/admin.php:909
-msgid "Open"
-msgstr "Offen"
-
-#: mod/admin.php:913
-msgid "No SSL policy, links will track page SSL state"
-msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
-
-#: mod/admin.php:914
-msgid "Force all links to use SSL"
-msgstr "SSL für alle Links erzwingen"
-
-#: mod/admin.php:915
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
-
-#: mod/admin.php:927 mod/admin.php:1553 mod/admin.php:1801 mod/admin.php:1875
-#: mod/admin.php:2025 mod/settings.php:676 mod/settings.php:786
-#: mod/settings.php:833 mod/settings.php:902 mod/settings.php:992
-#: mod/settings.php:1259
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: mod/admin.php:928 mod/register.php:263
-msgid "Registration"
-msgstr "Registrierung"
-
-#: mod/admin.php:929
-msgid "File upload"
-msgstr "Datei hochladen"
-
-#: mod/admin.php:930
-msgid "Policies"
-msgstr "Regeln"
-
-#: mod/admin.php:932
-msgid "Auto Discovered Contact Directory"
-msgstr "Automatisch ein Kontaktverzeichnis erstellen"
-
-#: mod/admin.php:933
-msgid "Performance"
-msgstr "Performance"
-
-#: mod/admin.php:934
-msgid "Worker"
-msgstr "Worker"
-
-#: mod/admin.php:935
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen."
-
-#: mod/admin.php:938
-msgid "Site name"
-msgstr "Seitenname"
-
-#: mod/admin.php:939
-msgid "Host name"
-msgstr "Host Name"
-
-#: mod/admin.php:940
-msgid "Sender Email"
-msgstr "Absender für Emails"
-
-#: mod/admin.php:940
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll."
-
-#: mod/admin.php:941
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: mod/admin.php:942
-msgid "Shortcut icon"
-msgstr "Shortcut Icon"
-
-#: mod/admin.php:942
-msgid "Link to an icon that will be used for browsers."
-msgstr "Link zu einem Icon, das Browser verwenden werden."
-
-#: mod/admin.php:943
-msgid "Touch icon"
-msgstr "Touch Icon"
-
-#: mod/admin.php:943
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen."
-
-#: mod/admin.php:944
-msgid "Additional Info"
-msgstr "Zusätzliche Informationen"
-
-#: mod/admin.php:944
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/siteinfo angezeigt werden."
-
-#: mod/admin.php:945
-msgid "System language"
-msgstr "Systemsprache"
-
-#: mod/admin.php:946
-msgid "System theme"
-msgstr "Systemweites Theme"
-
-#: mod/admin.php:946
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
-
-#: mod/admin.php:947
-msgid "Mobile system theme"
-msgstr "Systemweites mobiles Theme"
-
-#: mod/admin.php:947
-msgid "Theme for mobile devices"
-msgstr "Thema für mobile Geräte"
-
-#: mod/admin.php:948
-msgid "SSL link policy"
-msgstr "Regeln für SSL Links"
-
-#: mod/admin.php:948
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
-
-#: mod/admin.php:949
-msgid "Force SSL"
-msgstr "Erzwinge SSL"
-
-#: mod/admin.php:949
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
-
-#: mod/admin.php:950
-msgid "Old style 'Share'"
-msgstr "Altes \"Teilen\" Element"
-
-#: mod/admin.php:950
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr "Deaktiviert das BBCode Element \"share\" beim Wiederholen von Beiträgen."
-
-#: mod/admin.php:951
-msgid "Hide help entry from navigation menu"
-msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
-
-#: mod/admin.php:951
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
-
-#: mod/admin.php:952
-msgid "Single user instance"
-msgstr "Ein-Nutzer Instanz"
-
-#: mod/admin.php:952
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
-
-#: mod/admin.php:953
-msgid "Maximum image size"
-msgstr "Maximale Bildgröße"
-
-#: mod/admin.php:953
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
-
-#: mod/admin.php:954
-msgid "Maximum image length"
-msgstr "Maximale Bildlänge"
-
-#: mod/admin.php:954
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
-
-#: mod/admin.php:955
-msgid "JPEG image quality"
-msgstr "Qualität des JPEG Bildes"
-
-#: mod/admin.php:955
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
-
-#: mod/admin.php:957
-msgid "Register policy"
-msgstr "Registrierungsmethode"
-
-#: mod/admin.php:958
-msgid "Maximum Daily Registrations"
-msgstr "Maximum täglicher Registrierungen"
-
-#: mod/admin.php:958
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user"
-" registrations to accept per day.  If register is set to closed, this "
-"setting has no effect."
-msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
-
-#: mod/admin.php:959
-msgid "Register text"
-msgstr "Registrierungstext"
-
-#: mod/admin.php:959
-msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
-
-#: mod/admin.php:960
-msgid "Accounts abandoned after x days"
-msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
-
-#: mod/admin.php:960
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
-
-#: mod/admin.php:961
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
-
-#: mod/admin.php:961
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-
-#: mod/admin.php:962
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
-
-#: mod/admin.php:962
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-
-#: mod/admin.php:963
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
-
-#: mod/admin.php:963
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
-
-#: mod/admin.php:964
-msgid "Force publish"
-msgstr "Erzwinge Veröffentlichung"
-
-#: mod/admin.php:964
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
-
-#: mod/admin.php:965
-msgid "Global directory URL"
-msgstr "URL des weltweiten Verzeichnisses"
-
-#: mod/admin.php:965
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar."
-
-#: mod/admin.php:966
-msgid "Allow threaded items"
-msgstr "Erlaube Threads in Diskussionen"
-
-#: mod/admin.php:966
-msgid "Allow infinite level threading for items on this site."
-msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
-
-#: mod/admin.php:967
-msgid "Private posts by default for new users"
-msgstr "Private Beiträge als Standard für neue Nutzer"
-
-#: mod/admin.php:967
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
-
-#: mod/admin.php:968
-msgid "Don't include post content in email notifications"
-msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
-
-#: mod/admin.php:968
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
-
-#: mod/admin.php:969
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
-
-#: mod/admin.php:969
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
-
-#: mod/admin.php:970
-msgid "Don't embed private images in posts"
-msgstr "Private Bilder nicht in Beiträgen einbetten."
-
-#: mod/admin.php:970
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a "
-"while."
-msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
-
-#: mod/admin.php:971
-msgid "Allow Users to set remote_self"
-msgstr "Nutzern erlauben das remote_self Flag zu setzen"
-
-#: mod/admin.php:971
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
-
-#: mod/admin.php:972
-msgid "Block multiple registrations"
-msgstr "Unterbinde Mehrfachregistrierung"
-
-#: mod/admin.php:972
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."
-
-#: mod/admin.php:973
-msgid "OpenID support"
-msgstr "OpenID Unterstützung"
-
-#: mod/admin.php:973
-msgid "OpenID support for registration and logins."
-msgstr "OpenID-Unterstützung für Registrierung und Login."
-
-#: mod/admin.php:974
-msgid "Fullname check"
-msgstr "Namen auf Vollständigkeit überprüfen"
-
-#: mod/admin.php:974
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
-
-#: mod/admin.php:975
-msgid "UTF-8 Regular expressions"
-msgstr "UTF-8 Reguläre Ausdrücke"
-
-#: mod/admin.php:975
-msgid "Use PHP UTF8 regular expressions"
-msgstr "PHP UTF8 Ausdrücke verwenden"
-
-#: mod/admin.php:976
-msgid "Community Page Style"
-msgstr "Art der Gemeinschaftsseite"
-
-#: mod/admin.php:976
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr "Welche Art der Gemeinschaftsseite soll verwendet werden? Globale Gemeinschaftsseite zeigt alle öffentlichen Beiträge eines offenen dezentralen Netzwerks an die auf diesem Server eintreffen."
-
-#: mod/admin.php:977
-msgid "Posts per user on community page"
-msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
-
-#: mod/admin.php:977
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
-
-#: mod/admin.php:978
-msgid "Enable OStatus support"
-msgstr "OStatus Unterstützung aktivieren"
-
-#: mod/admin.php:978
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
-
-#: mod/admin.php:979
-msgid "OStatus conversation completion interval"
-msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen"
-
-#: mod/admin.php:979
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein."
-
-#: mod/admin.php:980
-msgid "Only import OStatus threads from our contacts"
-msgstr "Nur OStatus Konversationen unserer Kontakte importieren"
-
-#: mod/admin.php:980
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option"
-" we only store threads that are started by a contact that is known on our "
-"system."
-msgstr "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
-
-#: mod/admin.php:981
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. "
-
-#: mod/admin.php:983
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist."
-
-#: mod/admin.php:984
-msgid "Enable Diaspora support"
-msgstr "Diaspora Unterstützung aktivieren"
-
-#: mod/admin.php:984
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
-
-#: mod/admin.php:985
-msgid "Only allow Friendica contacts"
-msgstr "Nur Friendica-Kontakte erlauben"
-
-#: mod/admin.php:985
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
-
-#: mod/admin.php:986
-msgid "Verify SSL"
-msgstr "SSL Überprüfen"
-
-#: mod/admin.php:986
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you"
-" cannot connect (at all) to self-signed SSL sites."
-msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
-
-#: mod/admin.php:987
-msgid "Proxy user"
-msgstr "Proxy Nutzer"
-
-#: mod/admin.php:988
-msgid "Proxy URL"
-msgstr "Proxy URL"
-
-#: mod/admin.php:989
-msgid "Network timeout"
-msgstr "Netzwerk Wartezeit"
-
-#: mod/admin.php:989
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
-
-#: mod/admin.php:990
-msgid "Delivery interval"
-msgstr "Zustellungsintervall"
-
-#: mod/admin.php:990
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
-
-#: mod/admin.php:991
-msgid "Poll interval"
-msgstr "Abfrageintervall"
-
-#: mod/admin.php:991
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden, um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
-
-#: mod/admin.php:992
-msgid "Maximum Load Average"
-msgstr "Maximum Load Average"
-
-#: mod/admin.php:992
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
-
-#: mod/admin.php:993
-msgid "Maximum Load Average (Frontend)"
-msgstr "Maximum Load Average (Frontend)"
-
-#: mod/admin.php:993
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50."
-
-#: mod/admin.php:994
-msgid "Maximum table size for optimization"
-msgstr "Maximale Tabellengröße zur Optimierung"
-
-#: mod/admin.php:994
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
-msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Standard 100 MB. Gib -1 für Deaktivierung ein."
-
-#: mod/admin.php:995
-msgid "Minimum level of fragmentation"
-msgstr "Minimaler Fragmentationsgrad"
-
-#: mod/admin.php:995
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%"
-
-#: mod/admin.php:997
-msgid "Periodical check of global contacts"
-msgstr "Regelmäßig globale Kontakte überprüfen"
-
-#: mod/admin.php:997
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft."
-
-#: mod/admin.php:998
-msgid "Days between requery"
-msgstr "Tage zwischen erneuten Abfragen"
-
-#: mod/admin.php:998
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll."
-
-#: mod/admin.php:999
-msgid "Discover contacts from other servers"
-msgstr "Neue Kontakte auf anderen Servern entdecken"
-
-#: mod/admin.php:999
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
-msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
-
-#: mod/admin.php:1000
-msgid "Timeframe for fetching global contacts"
-msgstr "Zeitfenster für globale Kontakte"
-
-#: mod/admin.php:1000
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
-
-#: mod/admin.php:1001
-msgid "Search the local directory"
-msgstr "Lokales Verzeichnis durchsuchen"
-
-#: mod/admin.php:1001
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt umd die Suchresultate zu verbessern, wenn diese Suche wiederholt wird."
-
-#: mod/admin.php:1003
-msgid "Publish server information"
-msgstr "Server Informationen veröffentlichen"
-
-#: mod/admin.php:1003
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a"
-" href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Nutzer_innen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
-
-#: mod/admin.php:1005
-msgid "Use MySQL full text engine"
-msgstr "Nutze MySQL full text engine"
-
-#: mod/admin.php:1005
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden."
-
-#: mod/admin.php:1006
-msgid "Suppress Language"
-msgstr "Sprachinformation unterdrücken"
-
-#: mod/admin.php:1006
-msgid "Suppress language information in meta information about a posting."
-msgstr "Verhindert das Erzeugen der Meta-Information zur Spracherkennung eines Beitrags."
-
-#: mod/admin.php:1007
-msgid "Suppress Tags"
-msgstr "Tags Unterdrücken"
-
-#: mod/admin.php:1007
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags."
-
-#: mod/admin.php:1008
-msgid "Path to item cache"
-msgstr "Pfad zum Eintrag Cache"
-
-#: mod/admin.php:1008
-msgid "The item caches buffers generated bbcode and external images."
-msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert."
-
-#: mod/admin.php:1009
-msgid "Cache duration in seconds"
-msgstr "Cache-Dauer in Sekunden"
-
-#: mod/admin.php:1009
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One"
-" day). To disable the item cache, set the value to -1."
-msgstr "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1."
-
-#: mod/admin.php:1010
-msgid "Maximum numbers of comments per post"
-msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
-
-#: mod/admin.php:1010
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100."
-
-#: mod/admin.php:1011
-msgid "Path for lock file"
-msgstr "Pfad für die Sperrdatei"
-
-#: mod/admin.php:1011
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr "Die lock-Datei wird benutzt, damit nicht mehrere poller auf einmal laufen. Definiere hier einen Dateiverzeichnis."
-
-#: mod/admin.php:1012
-msgid "Temp path"
-msgstr "Temp Pfad"
-
-#: mod/admin.php:1012
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
-
-#: mod/admin.php:1013
-msgid "Base path to installation"
-msgstr "Basis-Pfad zur Installation"
-
-#: mod/admin.php:1013
-msgid ""
-"If the system cannot detect the correct path to your installation, enter the"
-" correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
-msgstr "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist."
-
-#: mod/admin.php:1014
-msgid "Disable picture proxy"
-msgstr "Bilder Proxy deaktivieren"
-
-#: mod/admin.php:1014
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."
-
-#: mod/admin.php:1015
-msgid "Enable old style pager"
-msgstr "Den Old-Style Pager aktiviren"
-
-#: mod/admin.php:1015
-msgid ""
-"The old style pager has page numbers but slows down massively the page "
-"speed."
-msgstr "Der Old-Style Pager zeigt Seitennummern an, verlangsamt aber auch drastisch das Laden einer Seite."
-
-#: mod/admin.php:1016
-msgid "Only search in tags"
-msgstr "Nur in Tags suchen"
-
-#: mod/admin.php:1016
-msgid "On large systems the text search can slow down the system extremely."
-msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen."
-
-#: mod/admin.php:1018
-msgid "New base url"
-msgstr "Neue Basis-URL"
-
-#: mod/admin.php:1018
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts"
-" of all users."
-msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle DFRN Kontakte deiner Nutzer_innen."
-
-#: mod/admin.php:1020
-msgid "RINO Encryption"
-msgstr "RINO Verschlüsselung"
-
-#: mod/admin.php:1020
-msgid "Encryption layer between nodes."
-msgstr "Verschlüsselung zwischen Friendica Instanzen"
-
-#: mod/admin.php:1021
-msgid "Embedly API key"
-msgstr "Embedly  API Schlüssel"
-
-#: mod/admin.php:1021
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr "<a href='http://embed.ly'>Embedly</a> wird verwendet um zusätzliche Informationen von Webseiten zu laden. Dies ist ein optionaler Parameter."
-
-#: mod/admin.php:1023
-msgid "Enable 'worker' background processing"
-msgstr "Aktiviere die 'Worker' Hintergrundprozesse"
-
-#: mod/admin.php:1023
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
-msgstr "Der 'background worker' Prozess begrenzt die Zahl der Prozesse, die im Hintergrund parallel laufen und beachtet dabei die Systemlast."
-
-#: mod/admin.php:1024
-msgid "Maximum number of parallel workers"
-msgstr "Maximale Anzahl parallel laufender Worker"
-
-#: mod/admin.php:1024
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4."
-
-#: mod/admin.php:1025
-msgid "Don't use 'proc_open' with the worker"
-msgstr "'proc_open' nicht mit den Workern verwenden"
-
-#: mod/admin.php:1025
-msgid ""
-"Enable this if your system doesn't allow the use of 'proc_open'. This can "
-"happen on shared hosters. If this is enabled you should increase the "
-"frequency of poller calls in your crontab."
-msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."
-
-#: mod/admin.php:1026
-msgid "Enable fastlane"
-msgstr "Aktiviere Fastlane"
-
-#: mod/admin.php:1026
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes"
-" with higher priority are blocked by processes of lower priority."
-msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
-
-#: mod/admin.php:1055
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
-
-#: mod/admin.php:1063
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt."
-
-#: mod/admin.php:1066
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s"
-
-#: mod/admin.php:1078
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s"
-
-#: mod/admin.php:1081
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s war erfolgreich."
-
-#: mod/admin.php:1085
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
-
-#: mod/admin.php:1087
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste."
-
-#: mod/admin.php:1106
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Updates."
-
-#: mod/admin.php:1107
-msgid "Check database structure"
-msgstr "Datenbank Struktur überprüfen"
-
-#: mod/admin.php:1112
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Updates"
-
-#: mod/admin.php:1113
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
-
-#: mod/admin.php:1114
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
-
-#: mod/admin.php:1115
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuchen, diesen Schritt automatisch auszuführen"
-
-#: mod/admin.php:1149
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt."
-
-#: mod/admin.php:1152
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
-
-#: mod/admin.php:1196
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Benutzer geblockt/freigegeben"
-msgstr[1] "%s Benutzer geblockt/freigegeben"
-
-#: mod/admin.php:1203
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s Nutzer gelöscht"
-msgstr[1] "%s Nutzer gelöscht"
-
-#: mod/admin.php:1250
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Nutzer '%s' gelöscht"
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Nutzer '%s' entsperrt"
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Nutzer '%s' gesperrt"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Register date"
-msgstr "Anmeldedatum"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last login"
-msgstr "Letzte Anmeldung"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last item"
-msgstr "Letzter Beitrag"
-
-#: mod/admin.php:1367 mod/settings.php:43
-msgid "Account"
-msgstr "Nutzerkonto"
-
-#: mod/admin.php:1376
-msgid "Add User"
-msgstr "Nutzer hinzufügen"
-
-#: mod/admin.php:1377
-msgid "select all"
-msgstr "Alle auswählen"
-
-#: mod/admin.php:1378
-msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
-
-#: mod/admin.php:1379
-msgid "User waiting for permanent deletion"
-msgstr "Nutzer wartet auf permanente Löschung"
-
-#: mod/admin.php:1380
-msgid "Request date"
-msgstr "Anfragedatum"
-
-#: mod/admin.php:1381
-msgid "No registrations."
-msgstr "Keine Neuanmeldungen."
-
-#: mod/admin.php:1383
-msgid "Deny"
-msgstr "Verwehren"
-
-#: mod/admin.php:1385 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Block"
-msgstr "Sperren"
-
-#: mod/admin.php:1386 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Unblock"
-msgstr "Entsperren"
-
-#: mod/admin.php:1387
-msgid "Site admin"
-msgstr "Seitenadministrator"
-
-#: mod/admin.php:1388
-msgid "Account expired"
-msgstr "Account ist abgelaufen"
-
-#: mod/admin.php:1391
-msgid "New User"
-msgstr "Neuer Nutzer"
-
-#: mod/admin.php:1392
-msgid "Deleted since"
-msgstr "Gelöscht seit"
-
-#: mod/admin.php:1397
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?"
-
-#: mod/admin.php:1398
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
-
-#: mod/admin.php:1408
-msgid "Name of the new user."
-msgstr "Name des neuen Nutzers"
-
-#: mod/admin.php:1409
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: mod/admin.php:1409
-msgid "Nickname of the new user."
-msgstr "Spitznamen für den neuen Nutzer"
-
-#: mod/admin.php:1410
-msgid "Email address of the new user."
-msgstr "Email Adresse des neuen Nutzers"
-
-#: mod/admin.php:1453
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Plugin %s deaktiviert."
-
-#: mod/admin.php:1457
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Plugin %s aktiviert."
-
-#: mod/admin.php:1468 mod/admin.php:1704
-msgid "Disable"
-msgstr "Ausschalten"
-
-#: mod/admin.php:1470 mod/admin.php:1706
-msgid "Enable"
-msgstr "Einschalten"
-
-#: mod/admin.php:1493 mod/admin.php:1751
-msgid "Toggle"
-msgstr "Umschalten"
-
-#: mod/admin.php:1501 mod/admin.php:1760
-msgid "Author: "
-msgstr "Autor:"
-
-#: mod/admin.php:1502 mod/admin.php:1761
-msgid "Maintainer: "
-msgstr "Betreuer:"
-
-#: mod/admin.php:1554
-msgid "Reload active plugins"
-msgstr "Aktive Plugins neu laden"
-
-#: mod/admin.php:1559
-#, php-format
-msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
-msgstr "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2$s."
-
-#: mod/admin.php:1664
-msgid "No themes found."
-msgstr "Keine Themen gefunden."
-
-#: mod/admin.php:1742
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: mod/admin.php:1802
-msgid "Reload active themes"
-msgstr "Aktives Theme neu laden"
-
-#: mod/admin.php:1807
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
-msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s patziert werden."
-
-#: mod/admin.php:1808
-msgid "[Experimental]"
-msgstr "[Experimentell]"
-
-#: mod/admin.php:1809
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
-
-#: mod/admin.php:1833
-msgid "Log settings updated."
-msgstr "Protokolleinstellungen aktualisiert."
-
-#: mod/admin.php:1865
-msgid "PHP log currently enabled."
-msgstr "PHP Protokollierung ist derzeit aktiviert."
-
-#: mod/admin.php:1867
-msgid "PHP log currently disabled."
-msgstr "PHP Protokollierung ist derzeit nicht aktiviert."
-
-#: mod/admin.php:1876
-msgid "Clear"
-msgstr "löschen"
-
-#: mod/admin.php:1881
-msgid "Enable Debugging"
-msgstr "Protokoll führen"
-
-#: mod/admin.php:1882
-msgid "Log file"
-msgstr "Protokolldatei"
-
-#: mod/admin.php:1882
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
-
-#: mod/admin.php:1883
-msgid "Log level"
-msgstr "Protokoll-Level"
-
-#: mod/admin.php:1886
-msgid "PHP logging"
-msgstr "PHP Protokollieren"
-
-#: mod/admin.php:1887
-msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "Off"
-msgstr "Aus"
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "On"
-msgstr "An"
-
-#: mod/admin.php:2015
-#, php-format
-msgid "Lock feature %s"
-msgstr "Feature festlegen: %s"
-
-#: mod/admin.php:2023
-msgid "Manage Additional Features"
-msgstr "Zusätzliche Features Verwalten"
-
 #: mod/allfriends.php:43
 msgid "No friends to display."
 msgstr "Keine Kontakte zum Anzeigen."
@@ -6791,6 +5387,10 @@ msgstr "%s teilt mit Dir"
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
+#: mod/contacts.php:530 mod/admin.php:885
+msgid "Never"
+msgstr "Niemals"
+
 #: mod/contacts.php:534
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
@@ -6816,6 +5416,10 @@ msgstr "Verbindungen mit diesem Kontakt verloren!"
 msgid "Fetch further information for feeds"
 msgstr "Weitere Informationen zu Feeds holen"
 
+#: mod/contacts.php:557 mod/admin.php:894
+msgid "Disabled"
+msgstr "Deaktiviert"
+
 #: mod/contacts.php:557
 msgid "Fetch information"
 msgstr "Beziehe Information"
@@ -6875,6 +5479,16 @@ msgstr "Öffentliche Beiträge aktualisieren"
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1412
+msgid "Unblock"
+msgstr "Entsperren"
+
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1411
+msgid "Block"
+msgstr "Sperren"
+
 #: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:1000
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
@@ -6978,7 +5592,7 @@ msgstr "Nur verborgene Kontakte anzeigen"
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:702
+#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:704
 msgid "Update"
 msgstr "Aktualisierungen"
 
@@ -7035,7 +5649,6 @@ msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
 #: mod/directory.php:197 view/theme/vier/theme.php:201
-#: view/theme/diabook/theme.php:525
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
@@ -7474,41 +6087,6 @@ msgid ""
 "poller."
 msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."
 
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr "Konnte den Originalbeitrag nicht finden."
-
-#: mod/item.php:340
-msgid "Empty post discarded."
-msgstr "Leerer Beitrag wurde verworfen."
-
-#: mod/item.php:895
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
-
-#: mod/item.php:985
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
-
-#: mod/item.php:987
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Du kannst sie online unter %s besuchen"
-
-#: mod/item.php:988
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."
-
-#: mod/item.php:992
-#, php-format
-msgid "%s posted an update."
-msgstr "%s hat ein Update veröffentlicht."
-
 #: mod/maintenance.php:9
 msgid "System down for maintenance"
 msgstr "System zur Wartung abgeschaltet"
@@ -7525,67 +6103,1513 @@ msgstr "ist interessiert an:"
 msgid "Profile Match"
 msgstr "Profilübereinstimmungen"
 
+#: mod/profile.php:179
+msgid "Tips for New Members"
+msgstr "Tipps für neue Nutzer"
+
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
+
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
+
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verbergen"
+
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
+msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
+
+#: mod/admin.php:92
+msgid "Theme settings updated."
+msgstr "Themeneinstellungen aktualisiert."
+
+#: mod/admin.php:156 mod/admin.php:951
+msgid "Site"
+msgstr "Seite"
+
+#: mod/admin.php:157 mod/admin.php:895 mod/admin.php:1400 mod/admin.php:1416
+msgid "Users"
+msgstr "Nutzer"
+
+#: mod/admin.php:158 mod/admin.php:1518 mod/admin.php:1578 mod/settings.php:74
+msgid "Plugins"
+msgstr "Plugins"
+
+#: mod/admin.php:159 mod/admin.php:1776 mod/admin.php:1826
+msgid "Themes"
+msgstr "Themen"
+
+#: mod/admin.php:160 mod/settings.php:52
+msgid "Additional features"
+msgstr "Zusätzliche Features"
+
+#: mod/admin.php:161
+msgid "DB updates"
+msgstr "DB Updates"
+
+#: mod/admin.php:162 mod/admin.php:406
+msgid "Inspect Queue"
+msgstr "Warteschlange Inspizieren"
+
+#: mod/admin.php:163 mod/admin.php:372
+msgid "Federation Statistics"
+msgstr "Federation Statistik"
+
+#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1900
+msgid "Logs"
+msgstr "Protokolle"
+
+#: mod/admin.php:178 mod/admin.php:1968
+msgid "View Logs"
+msgstr "Protokolle anzeigen"
+
+#: mod/admin.php:179
+msgid "probe address"
+msgstr "Adresse untersuchen"
+
+#: mod/admin.php:180
+msgid "check webfinger"
+msgstr "Webfinger überprüfen"
+
+#: mod/admin.php:187
+msgid "Plugin Features"
+msgstr "Plugin Features"
+
+#: mod/admin.php:189
+msgid "diagnostics"
+msgstr "Diagnose"
+
+#: mod/admin.php:190
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzeranmeldungen die auf Bestätigung warten"
+
+#: mod/admin.php:306
+msgid "unknown"
+msgstr "Unbekannt"
+
+#: mod/admin.php:365
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
+msgstr "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."
+
+#: mod/admin.php:366
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
+msgstr "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."
+
+#: mod/admin.php:371 mod/admin.php:405 mod/admin.php:483 mod/admin.php:950
+#: mod/admin.php:1399 mod/admin.php:1517 mod/admin.php:1577 mod/admin.php:1775
+#: mod/admin.php:1825 mod/admin.php:1899 mod/admin.php:1967
+msgid "Administration"
+msgstr "Administration"
+
+#: mod/admin.php:378
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
+msgstr "Momentan kennt dieser Knoten %d andere Knoten der folgenden Plattformen:"
+
+#: mod/admin.php:408
+msgid "ID"
+msgstr "ID"
+
+#: mod/admin.php:409
+msgid "Recipient Name"
+msgstr "Empfänger Name"
+
+#: mod/admin.php:410
+msgid "Recipient Profile"
+msgstr "Empfänger Profil"
+
+#: mod/admin.php:412
+msgid "Created"
+msgstr "Erstellt"
+
+#: mod/admin.php:413
+msgid "Last Tried"
+msgstr "Zuletzt versucht"
+
+#: mod/admin.php:414
+msgid ""
+"This page lists the content of the queue for outgoing postings. These are "
+"postings the initial delivery failed for. They will be resend later and "
+"eventually deleted if the delivery fails permanently."
+msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
+
+#: mod/admin.php:438
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should"
+" change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the "
+"<tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your "
+"Friendica installation.<br />"
+msgstr "Deine DB enthält einige Tabellen die noch auf MyISAM laufen. Du solltest den Engine-Type auf InnoDB umstellen, da Friendica in Zukunft einige InnoDB Features nutzen wird. Eine Anleitung zur Umstellung kannst du <a href=\"%s\">hier</a> finden. Außerdem kannst du das <tt>convert_innodb.sql</tt> Skript verwenden, das du im <tt>/util</tt> Verzeichnis deiner Friendica Installation findest."
+
+#: mod/admin.php:443
+msgid ""
+"You are using a MySQL version which does not support all features that "
+"Friendica uses. You should consider switching to MariaDB."
+msgstr "Du verwendets eine MySQL Version die nicht alle Features unterstützt die Friendica verwendet. Wir empfehlen dir einen Wechsel auf MariaDB, falls dies möglich ist."
+
+#: mod/admin.php:447 mod/admin.php:1348
+msgid "Normal Account"
+msgstr "Normales Konto"
+
+#: mod/admin.php:448 mod/admin.php:1349
+msgid "Soapbox Account"
+msgstr "Marktschreier-Konto"
+
+#: mod/admin.php:449 mod/admin.php:1350
+msgid "Community/Celebrity Account"
+msgstr "Forum/Promi-Konto"
+
+#: mod/admin.php:450 mod/admin.php:1351
+msgid "Automatic Friend Account"
+msgstr "Automatisches Freundekonto"
+
+#: mod/admin.php:451
+msgid "Blog Account"
+msgstr "Blog-Konto"
+
+#: mod/admin.php:452
+msgid "Private Forum"
+msgstr "Privates Forum"
+
+#: mod/admin.php:478
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
+
+#: mod/admin.php:484
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: mod/admin.php:487
+msgid "Registered users"
+msgstr "Registrierte Nutzer"
+
+#: mod/admin.php:489
+msgid "Pending registrations"
+msgstr "Anstehende Anmeldungen"
+
+#: mod/admin.php:490
+msgid "Version"
+msgstr "Version"
+
+#: mod/admin.php:495
+msgid "Active plugins"
+msgstr "Aktive Plugins"
+
+#: mod/admin.php:520
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen"
+
+#: mod/admin.php:823
+msgid "RINO2 needs mcrypt php extension to work."
+msgstr "RINO2 benötigt die PHP Extension mcrypt."
+
+#: mod/admin.php:831
+msgid "Site settings updated."
+msgstr "Seiteneinstellungen aktualisiert."
+
+#: mod/admin.php:859 mod/settings.php:934
+msgid "No special theme for mobile devices"
+msgstr "Kein spezielles Theme für mobile Geräte verwenden."
+
+#: mod/admin.php:878
+msgid "No community page"
+msgstr "Keine Gemeinschaftsseite"
+
+#: mod/admin.php:879
+msgid "Public postings from users of this site"
+msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite"
+
+#: mod/admin.php:880
+msgid "Global community page"
+msgstr "Globale Gemeinschaftsseite"
+
+#: mod/admin.php:886
+msgid "At post arrival"
+msgstr "Beim Empfang von Nachrichten"
+
+#: mod/admin.php:896
+msgid "Users, Global Contacts"
+msgstr "Nutzer, globale Kontakte"
+
+#: mod/admin.php:897
+msgid "Users, Global Contacts/fallback"
+msgstr "Nutzer, globale Kontakte / Fallback"
+
+#: mod/admin.php:901
+msgid "One month"
+msgstr "ein Monat"
+
+#: mod/admin.php:902
+msgid "Three months"
+msgstr "drei Monate"
+
+#: mod/admin.php:903
+msgid "Half a year"
+msgstr "ein halbes Jahr"
+
+#: mod/admin.php:904
+msgid "One year"
+msgstr "ein Jahr"
+
+#: mod/admin.php:909
+msgid "Multi user instance"
+msgstr "Mehrbenutzer Instanz"
+
+#: mod/admin.php:932
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: mod/admin.php:933
+msgid "Requires approval"
+msgstr "Bedarf der Zustimmung"
+
+#: mod/admin.php:934
+msgid "Open"
+msgstr "Offen"
+
+#: mod/admin.php:938
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+
+#: mod/admin.php:939
+msgid "Force all links to use SSL"
+msgstr "SSL für alle Links erzwingen"
+
+#: mod/admin.php:940
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
+
+#: mod/admin.php:952 mod/admin.php:1579 mod/admin.php:1827 mod/admin.php:1901
+#: mod/admin.php:2051 mod/settings.php:678 mod/settings.php:788
+#: mod/settings.php:835 mod/settings.php:904 mod/settings.php:996
+#: mod/settings.php:1264
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: mod/admin.php:953 mod/register.php:272
+msgid "Registration"
+msgstr "Registrierung"
+
+#: mod/admin.php:954
+msgid "File upload"
+msgstr "Datei hochladen"
+
+#: mod/admin.php:955
+msgid "Policies"
+msgstr "Regeln"
+
+#: mod/admin.php:957
+msgid "Auto Discovered Contact Directory"
+msgstr "Automatisch ein Kontaktverzeichnis erstellen"
+
+#: mod/admin.php:958
+msgid "Performance"
+msgstr "Performance"
+
+#: mod/admin.php:959
+msgid "Worker"
+msgstr "Worker"
+
+#: mod/admin.php:960
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen."
+
+#: mod/admin.php:963
+msgid "Site name"
+msgstr "Seitenname"
+
+#: mod/admin.php:964
+msgid "Host name"
+msgstr "Host Name"
+
+#: mod/admin.php:965
+msgid "Sender Email"
+msgstr "Absender für Emails"
+
+#: mod/admin.php:965
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll."
+
+#: mod/admin.php:966
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
+
+#: mod/admin.php:967
+msgid "Shortcut icon"
+msgstr "Shortcut Icon"
+
+#: mod/admin.php:967
+msgid "Link to an icon that will be used for browsers."
+msgstr "Link zu einem Icon, das Browser verwenden werden."
+
+#: mod/admin.php:968
+msgid "Touch icon"
+msgstr "Touch Icon"
+
+#: mod/admin.php:968
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen."
+
+#: mod/admin.php:969
+msgid "Additional Info"
+msgstr "Zusätzliche Informationen"
+
+#: mod/admin.php:969
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
+msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/siteinfo angezeigt werden."
+
+#: mod/admin.php:970
+msgid "System language"
+msgstr "Systemsprache"
+
+#: mod/admin.php:971
+msgid "System theme"
+msgstr "Systemweites Theme"
+
+#: mod/admin.php:971
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
+
+#: mod/admin.php:972
+msgid "Mobile system theme"
+msgstr "Systemweites mobiles Theme"
+
+#: mod/admin.php:972
+msgid "Theme for mobile devices"
+msgstr "Thema für mobile Geräte"
+
+#: mod/admin.php:973
+msgid "SSL link policy"
+msgstr "Regeln für SSL Links"
+
+#: mod/admin.php:973
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
+
+#: mod/admin.php:974
+msgid "Force SSL"
+msgstr "Erzwinge SSL"
+
+#: mod/admin.php:974
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
+" to endless loops."
+msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
+
+#: mod/admin.php:975
+msgid "Old style 'Share'"
+msgstr "Altes \"Teilen\" Element"
+
+#: mod/admin.php:975
+msgid "Deactivates the bbcode element 'share' for repeating items."
+msgstr "Deaktiviert das BBCode Element \"share\" beim Wiederholen von Beiträgen."
+
+#: mod/admin.php:976
+msgid "Hide help entry from navigation menu"
+msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
+
+#: mod/admin.php:976
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
+
+#: mod/admin.php:977
+msgid "Single user instance"
+msgstr "Ein-Nutzer Instanz"
+
+#: mod/admin.php:977
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
+
+#: mod/admin.php:978
+msgid "Maximum image size"
+msgstr "Maximale Bildgröße"
+
+#: mod/admin.php:978
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
+
+#: mod/admin.php:979
+msgid "Maximum image length"
+msgstr "Maximale Bildlänge"
+
+#: mod/admin.php:979
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
+
+#: mod/admin.php:980
+msgid "JPEG image quality"
+msgstr "Qualität des JPEG Bildes"
+
+#: mod/admin.php:980
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
+
+#: mod/admin.php:982
+msgid "Register policy"
+msgstr "Registrierungsmethode"
+
+#: mod/admin.php:983
+msgid "Maximum Daily Registrations"
+msgstr "Maximum täglicher Registrierungen"
+
+#: mod/admin.php:983
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user"
+" registrations to accept per day.  If register is set to closed, this "
+"setting has no effect."
+msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
+
+#: mod/admin.php:984
+msgid "Register text"
+msgstr "Registrierungstext"
+
+#: mod/admin.php:984
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
+
+#: mod/admin.php:985
+msgid "Accounts abandoned after x days"
+msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
+
+#: mod/admin.php:985
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
+
+#: mod/admin.php:986
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
+
+#: mod/admin.php:986
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: mod/admin.php:987
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
+
+#: mod/admin.php:987
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: mod/admin.php:988
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
+
+#: mod/admin.php:988
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
+
+#: mod/admin.php:989
+msgid "Force publish"
+msgstr "Erzwinge Veröffentlichung"
+
+#: mod/admin.php:989
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
+
+#: mod/admin.php:990
+msgid "Global directory URL"
+msgstr "URL des weltweiten Verzeichnisses"
+
+#: mod/admin.php:990
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar."
+
+#: mod/admin.php:991
+msgid "Allow threaded items"
+msgstr "Erlaube Threads in Diskussionen"
+
+#: mod/admin.php:991
+msgid "Allow infinite level threading for items on this site."
+msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
+
+#: mod/admin.php:992
+msgid "Private posts by default for new users"
+msgstr "Private Beiträge als Standard für neue Nutzer"
+
+#: mod/admin.php:992
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
+
+#: mod/admin.php:993
+msgid "Don't include post content in email notifications"
+msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
+
+#: mod/admin.php:993
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
+
+#: mod/admin.php:994
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
+
+#: mod/admin.php:994
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
+
+#: mod/admin.php:995
+msgid "Don't embed private images in posts"
+msgstr "Private Bilder nicht in Beiträgen einbetten."
+
+#: mod/admin.php:995
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
+
+#: mod/admin.php:996
+msgid "Allow Users to set remote_self"
+msgstr "Nutzern erlauben das remote_self Flag zu setzen"
+
+#: mod/admin.php:996
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
+
+#: mod/admin.php:997
+msgid "Block multiple registrations"
+msgstr "Unterbinde Mehrfachregistrierung"
+
+#: mod/admin.php:997
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."
+
+#: mod/admin.php:998
+msgid "OpenID support"
+msgstr "OpenID Unterstützung"
+
+#: mod/admin.php:998
+msgid "OpenID support for registration and logins."
+msgstr "OpenID-Unterstützung für Registrierung und Login."
+
+#: mod/admin.php:999
+msgid "Fullname check"
+msgstr "Namen auf Vollständigkeit überprüfen"
+
+#: mod/admin.php:999
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
+
+#: mod/admin.php:1000
+msgid "UTF-8 Regular expressions"
+msgstr "UTF-8 Reguläre Ausdrücke"
+
+#: mod/admin.php:1000
+msgid "Use PHP UTF8 regular expressions"
+msgstr "PHP UTF8 Ausdrücke verwenden"
+
+#: mod/admin.php:1001
+msgid "Community Page Style"
+msgstr "Art der Gemeinschaftsseite"
+
+#: mod/admin.php:1001
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr "Welche Art der Gemeinschaftsseite soll verwendet werden? Globale Gemeinschaftsseite zeigt alle öffentlichen Beiträge eines offenen dezentralen Netzwerks an die auf diesem Server eintreffen."
+
+#: mod/admin.php:1002
+msgid "Posts per user on community page"
+msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
+
+#: mod/admin.php:1002
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
+
+#: mod/admin.php:1003
+msgid "Enable OStatus support"
+msgstr "OStatus Unterstützung aktivieren"
+
+#: mod/admin.php:1003
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
+
+#: mod/admin.php:1004
+msgid "OStatus conversation completion interval"
+msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen"
+
+#: mod/admin.php:1004
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein."
+
+#: mod/admin.php:1005
+msgid "Only import OStatus threads from our contacts"
+msgstr "Nur OStatus Konversationen unserer Kontakte importieren"
+
+#: mod/admin.php:1005
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option"
+" we only store threads that are started by a contact that is known on our "
+"system."
+msgstr "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
+
+#: mod/admin.php:1006
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. "
+
+#: mod/admin.php:1008
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub"
+" directory."
+msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist."
+
+#: mod/admin.php:1009
+msgid "Enable Diaspora support"
+msgstr "Diaspora Unterstützung aktivieren"
+
+#: mod/admin.php:1009
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
+
+#: mod/admin.php:1010
+msgid "Only allow Friendica contacts"
+msgstr "Nur Friendica-Kontakte erlauben"
+
+#: mod/admin.php:1010
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
+
+#: mod/admin.php:1011
+msgid "Verify SSL"
+msgstr "SSL Überprüfen"
+
+#: mod/admin.php:1011
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
+
+#: mod/admin.php:1012
+msgid "Proxy user"
+msgstr "Proxy Nutzer"
+
+#: mod/admin.php:1013
+msgid "Proxy URL"
+msgstr "Proxy URL"
+
+#: mod/admin.php:1014
+msgid "Network timeout"
+msgstr "Netzwerk Wartezeit"
+
+#: mod/admin.php:1014
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
+
+#: mod/admin.php:1015
+msgid "Delivery interval"
+msgstr "Zustellungsintervall"
+
+#: mod/admin.php:1015
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
+
+#: mod/admin.php:1016
+msgid "Poll interval"
+msgstr "Abfrageintervall"
+
+#: mod/admin.php:1016
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden, um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
+
+#: mod/admin.php:1017
+msgid "Maximum Load Average"
+msgstr "Maximum Load Average"
+
+#: mod/admin.php:1017
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
+
+#: mod/admin.php:1018
+msgid "Maximum Load Average (Frontend)"
+msgstr "Maximum Load Average (Frontend)"
+
+#: mod/admin.php:1018
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50."
+
+#: mod/admin.php:1019
+msgid "Maximum table size for optimization"
+msgstr "Maximale Tabellengröße zur Optimierung"
+
+#: mod/admin.php:1019
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
+msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Standard 100 MB. Gib -1 für Deaktivierung ein."
+
+#: mod/admin.php:1020
+msgid "Minimum level of fragmentation"
+msgstr "Minimaler Fragmentationsgrad"
+
+#: mod/admin.php:1020
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%"
+
+#: mod/admin.php:1022
+msgid "Periodical check of global contacts"
+msgstr "Regelmäßig globale Kontakte überprüfen"
+
+#: mod/admin.php:1022
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft."
+
+#: mod/admin.php:1023
+msgid "Days between requery"
+msgstr "Tage zwischen erneuten Abfragen"
+
+#: mod/admin.php:1023
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll."
+
+#: mod/admin.php:1024
+msgid "Discover contacts from other servers"
+msgstr "Neue Kontakte auf anderen Servern entdecken"
+
+#: mod/admin.php:1024
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
+msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
+
+#: mod/admin.php:1025
+msgid "Timeframe for fetching global contacts"
+msgstr "Zeitfenster für globale Kontakte"
+
+#: mod/admin.php:1025
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
+
+#: mod/admin.php:1026
+msgid "Search the local directory"
+msgstr "Lokales Verzeichnis durchsuchen"
+
+#: mod/admin.php:1026
+msgid ""
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
+msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt umd die Suchresultate zu verbessern, wenn diese Suche wiederholt wird."
+
+#: mod/admin.php:1028
+msgid "Publish server information"
+msgstr "Server Informationen veröffentlichen"
+
+#: mod/admin.php:1028
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a"
+" href='http://the-federation.info/'>the-federation.info</a> for details."
+msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Nutzer_innen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
+
+#: mod/admin.php:1030
+msgid "Use MySQL full text engine"
+msgstr "Nutze MySQL full text engine"
+
+#: mod/admin.php:1030
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr "Aktiviert die 'full text engine'. Beschleunigt die Suche - aber es kann nur nach vier oder mehr Zeichen gesucht werden."
+
+#: mod/admin.php:1031
+msgid "Suppress Language"
+msgstr "Sprachinformation unterdrücken"
+
+#: mod/admin.php:1031
+msgid "Suppress language information in meta information about a posting."
+msgstr "Verhindert das Erzeugen der Meta-Information zur Spracherkennung eines Beitrags."
+
+#: mod/admin.php:1032
+msgid "Suppress Tags"
+msgstr "Tags Unterdrücken"
+
+#: mod/admin.php:1032
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags."
+
+#: mod/admin.php:1033
+msgid "Path to item cache"
+msgstr "Pfad zum Eintrag Cache"
+
+#: mod/admin.php:1033
+msgid "The item caches buffers generated bbcode and external images."
+msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert."
+
+#: mod/admin.php:1034
+msgid "Cache duration in seconds"
+msgstr "Cache-Dauer in Sekunden"
+
+#: mod/admin.php:1034
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day). To disable the item cache, set the value to -1."
+msgstr "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1."
+
+#: mod/admin.php:1035
+msgid "Maximum numbers of comments per post"
+msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
+
+#: mod/admin.php:1035
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100."
+
+#: mod/admin.php:1036
+msgid "Path for lock file"
+msgstr "Pfad für die Sperrdatei"
+
+#: mod/admin.php:1036
+msgid ""
+"The lock file is used to avoid multiple pollers at one time. Only define a "
+"folder here."
+msgstr "Die lock-Datei wird benutzt, damit nicht mehrere poller auf einmal laufen. Definiere hier einen Dateiverzeichnis."
+
+#: mod/admin.php:1037
+msgid "Temp path"
+msgstr "Temp Pfad"
+
+#: mod/admin.php:1037
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
+
+#: mod/admin.php:1038
+msgid "Base path to installation"
+msgstr "Basis-Pfad zur Installation"
+
+#: mod/admin.php:1038
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the"
+" correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
+msgstr "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist."
+
+#: mod/admin.php:1039
+msgid "Disable picture proxy"
+msgstr "Bilder Proxy deaktivieren"
+
+#: mod/admin.php:1039
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on"
+" systems with very low bandwith."
+msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."
+
+#: mod/admin.php:1040
+msgid "Enable old style pager"
+msgstr "Den Old-Style Pager aktiviren"
+
+#: mod/admin.php:1040
+msgid ""
+"The old style pager has page numbers but slows down massively the page "
+"speed."
+msgstr "Der Old-Style Pager zeigt Seitennummern an, verlangsamt aber auch drastisch das Laden einer Seite."
+
+#: mod/admin.php:1041
+msgid "Only search in tags"
+msgstr "Nur in Tags suchen"
+
+#: mod/admin.php:1041
+msgid "On large systems the text search can slow down the system extremely."
+msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen."
+
+#: mod/admin.php:1043
+msgid "New base url"
+msgstr "Neue Basis-URL"
+
+#: mod/admin.php:1043
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts"
+" of all users."
+msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle DFRN Kontakte deiner Nutzer_innen."
+
+#: mod/admin.php:1045
+msgid "RINO Encryption"
+msgstr "RINO Verschlüsselung"
+
+#: mod/admin.php:1045
+msgid "Encryption layer between nodes."
+msgstr "Verschlüsselung zwischen Friendica Instanzen"
+
+#: mod/admin.php:1046
+msgid "Embedly API key"
+msgstr "Embedly  API Schlüssel"
+
+#: mod/admin.php:1046
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr "<a href='http://embed.ly'>Embedly</a> wird verwendet um zusätzliche Informationen von Webseiten zu laden. Dies ist ein optionaler Parameter."
+
+#: mod/admin.php:1048
+msgid "Enable 'worker' background processing"
+msgstr "Aktiviere die 'Worker' Hintergrundprozesse"
+
+#: mod/admin.php:1048
+msgid ""
+"The worker background processing limits the number of parallel background "
+"jobs to a maximum number and respects the system load."
+msgstr "Der 'background worker' Prozess begrenzt die Zahl der Prozesse, die im Hintergrund parallel laufen und beachtet dabei die Systemlast."
+
+#: mod/admin.php:1049
+msgid "Maximum number of parallel workers"
+msgstr "Maximale Anzahl parallel laufender Worker"
+
+#: mod/admin.php:1049
+msgid ""
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
+msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4."
+
+#: mod/admin.php:1050
+msgid "Don't use 'proc_open' with the worker"
+msgstr "'proc_open' nicht mit den Workern verwenden"
+
+#: mod/admin.php:1050
+msgid ""
+"Enable this if your system doesn't allow the use of 'proc_open'. This can "
+"happen on shared hosters. If this is enabled you should increase the "
+"frequency of poller calls in your crontab."
+msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."
+
+#: mod/admin.php:1051
+msgid "Enable fastlane"
+msgstr "Aktiviere Fastlane"
+
+#: mod/admin.php:1051
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes"
+" with higher priority are blocked by processes of lower priority."
+msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
+
+#: mod/admin.php:1080
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
+
+#: mod/admin.php:1088
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt."
+
+#: mod/admin.php:1091
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s"
+
+#: mod/admin.php:1103
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s"
+
+#: mod/admin.php:1106
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s war erfolgreich."
+
+#: mod/admin.php:1110
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
+
+#: mod/admin.php:1112
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste."
+
+#: mod/admin.php:1131
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Updates."
+
+#: mod/admin.php:1132
+msgid "Check database structure"
+msgstr "Datenbank Struktur überprüfen"
+
+#: mod/admin.php:1137
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Updates"
+
+#: mod/admin.php:1138
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
+
+#: mod/admin.php:1139
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
+
+#: mod/admin.php:1140
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuchen, diesen Schritt automatisch auszuführen"
+
+#: mod/admin.php:1174
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt."
+
+#: mod/admin.php:1177
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
+
+#: mod/admin.php:1221
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s Benutzer geblockt/freigegeben"
+msgstr[1] "%s Benutzer geblockt/freigegeben"
+
+#: mod/admin.php:1228
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s Nutzer gelöscht"
+msgstr[1] "%s Nutzer gelöscht"
+
+#: mod/admin.php:1275
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Nutzer '%s' gelöscht"
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Nutzer '%s' entsperrt"
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Nutzer '%s' gesperrt"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Register date"
+msgstr "Anmeldedatum"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last item"
+msgstr "Letzter Beitrag"
+
+#: mod/admin.php:1392 mod/settings.php:43
+msgid "Account"
+msgstr "Nutzerkonto"
+
+#: mod/admin.php:1401
+msgid "Add User"
+msgstr "Nutzer hinzufügen"
+
+#: mod/admin.php:1402
+msgid "select all"
+msgstr "Alle auswählen"
+
+#: mod/admin.php:1403
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
+
+#: mod/admin.php:1404
+msgid "User waiting for permanent deletion"
+msgstr "Nutzer wartet auf permanente Löschung"
+
+#: mod/admin.php:1405
+msgid "Request date"
+msgstr "Anfragedatum"
+
+#: mod/admin.php:1406
+msgid "No registrations."
+msgstr "Keine Neuanmeldungen."
+
+#: mod/admin.php:1407
+msgid "Note from the user"
+msgstr "Hinweis vom Nutzer"
+
+#: mod/admin.php:1409
+msgid "Deny"
+msgstr "Verwehren"
+
+#: mod/admin.php:1413
+msgid "Site admin"
+msgstr "Seitenadministrator"
+
+#: mod/admin.php:1414
+msgid "Account expired"
+msgstr "Account ist abgelaufen"
+
+#: mod/admin.php:1417
+msgid "New User"
+msgstr "Neuer Nutzer"
+
+#: mod/admin.php:1418
+msgid "Deleted since"
+msgstr "Gelöscht seit"
+
+#: mod/admin.php:1423
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?"
+
+#: mod/admin.php:1424
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
+
+#: mod/admin.php:1434
+msgid "Name of the new user."
+msgstr "Name des neuen Nutzers"
+
+#: mod/admin.php:1435
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: mod/admin.php:1435
+msgid "Nickname of the new user."
+msgstr "Spitznamen für den neuen Nutzer"
+
+#: mod/admin.php:1436
+msgid "Email address of the new user."
+msgstr "Email Adresse des neuen Nutzers"
+
+#: mod/admin.php:1479
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s deaktiviert."
+
+#: mod/admin.php:1483
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s aktiviert."
+
+#: mod/admin.php:1494 mod/admin.php:1730
+msgid "Disable"
+msgstr "Ausschalten"
+
+#: mod/admin.php:1496 mod/admin.php:1732
+msgid "Enable"
+msgstr "Einschalten"
+
+#: mod/admin.php:1519 mod/admin.php:1777
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: mod/admin.php:1527 mod/admin.php:1786
+msgid "Author: "
+msgstr "Autor:"
+
+#: mod/admin.php:1528 mod/admin.php:1787
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: mod/admin.php:1580
+msgid "Reload active plugins"
+msgstr "Aktive Plugins neu laden"
+
+#: mod/admin.php:1585
+#, php-format
+msgid ""
+"There are currently no plugins available on your node. You can find the "
+"official plugin repository at %1$s and might find other interesting plugins "
+"in the open plugin registry at %2$s"
+msgstr "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2$s."
+
+#: mod/admin.php:1690
+msgid "No themes found."
+msgstr "Keine Themen gefunden."
+
+#: mod/admin.php:1768
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: mod/admin.php:1828
+msgid "Reload active themes"
+msgstr "Aktives Theme neu laden"
+
+#: mod/admin.php:1833
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
+msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s patziert werden."
+
+#: mod/admin.php:1834
+msgid "[Experimental]"
+msgstr "[Experimentell]"
+
+#: mod/admin.php:1835
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
+
+#: mod/admin.php:1859
+msgid "Log settings updated."
+msgstr "Protokolleinstellungen aktualisiert."
+
+#: mod/admin.php:1891
+msgid "PHP log currently enabled."
+msgstr "PHP Protokollierung ist derzeit aktiviert."
+
+#: mod/admin.php:1893
+msgid "PHP log currently disabled."
+msgstr "PHP Protokollierung ist derzeit nicht aktiviert."
+
+#: mod/admin.php:1902
+msgid "Clear"
+msgstr "löschen"
+
+#: mod/admin.php:1907
+msgid "Enable Debugging"
+msgstr "Protokoll führen"
+
+#: mod/admin.php:1908
+msgid "Log file"
+msgstr "Protokolldatei"
+
+#: mod/admin.php:1908
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
+
+#: mod/admin.php:1909
+msgid "Log level"
+msgstr "Protokoll-Level"
+
+#: mod/admin.php:1912
+msgid "PHP logging"
+msgstr "PHP Protokollieren"
+
+#: mod/admin.php:1913
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
+msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "Off"
+msgstr "Aus"
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "On"
+msgstr "An"
+
+#: mod/admin.php:2041
+#, php-format
+msgid "Lock feature %s"
+msgstr "Feature festlegen: %s"
+
+#: mod/admin.php:2049
+msgid "Manage Additional Features"
+msgstr "Zusätzliche Features Verwalten"
+
+#: mod/item.php:116
+msgid "Unable to locate original post."
+msgstr "Konnte den Originalbeitrag nicht finden."
+
+#: mod/item.php:340
+msgid "Empty post discarded."
+msgstr "Leerer Beitrag wurde verworfen."
+
+#: mod/item.php:898
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
+
+#: mod/item.php:988
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
+
+#: mod/item.php:990
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Du kannst sie online unter %s besuchen"
+
+#: mod/item.php:991
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."
+
+#: mod/item.php:995
+#, php-format
+msgid "%s posted an update."
+msgstr "%s hat ein Update veröffentlicht."
+
 #: mod/network.php:398
 #, php-format
-msgid "Warning: This group contains %s member from an insecure network."
+msgid ""
+"Warning: This group contains %s member from a network that doesn't allow non"
+" public messages."
 msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
-msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann."
+msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können."
 
 #: mod/network.php:401
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."
 
-#: mod/network.php:528
+#: mod/network.php:529
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
 
-#: mod/network.php:533
+#: mod/network.php:534
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: mod/network.php:826
+#: mod/network.php:827
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: mod/network.php:829
+#: mod/network.php:830
 msgid "Sort by Comment Date"
 msgstr "Nach Kommentardatum sortieren"
 
-#: mod/network.php:834
+#: mod/network.php:835
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: mod/network.php:837
+#: mod/network.php:838
 msgid "Sort by Post Date"
 msgstr "Nach Beitragsdatum sortieren"
 
-#: mod/network.php:848
+#: mod/network.php:849
 msgid "Posts that mention or involve you"
 msgstr "Beiträge, in denen es um Dich geht"
 
-#: mod/network.php:856
+#: mod/network.php:857
 msgid "New"
 msgstr "Neue"
 
-#: mod/network.php:859
+#: mod/network.php:860
 msgid "Activity Stream - by date"
 msgstr "Aktivitäten-Stream - nach Datum"
 
-#: mod/network.php:867
+#: mod/network.php:868
 msgid "Shared Links"
 msgstr "Geteilte Links"
 
-#: mod/network.php:870
+#: mod/network.php:871
 msgid "Interesting Links"
 msgstr "Interessante Links"
 
-#: mod/network.php:878
+#: mod/network.php:879
 msgid "Starred"
 msgstr "Markierte"
 
-#: mod/network.php:881
+#: mod/network.php:882
 msgid "Favourite Posts"
 msgstr "Favorisierte Beiträge"
 
@@ -7667,11 +7691,11 @@ msgstr "oder existierender Albumname: "
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1295
+#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1300
 msgid "Show to Groups"
 msgstr "Zeige den Gruppen"
 
-#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1296
+#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1301
 msgid "Show to Contacts"
 msgstr "Zeige den Kontakten"
 
@@ -7776,22 +7800,18 @@ msgstr "Karte"
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: mod/ping.php:234
+#: mod/ping.php:211
 msgid "{0} wants to be your friend"
 msgstr "{0} möchte mit Dir in Kontakt treten"
 
-#: mod/ping.php:249
+#: mod/ping.php:226
 msgid "{0} sent you a message"
 msgstr "{0} schickte Dir eine Nachricht"
 
-#: mod/ping.php:264
+#: mod/ping.php:241
 msgid "{0} requested registration"
 msgstr "{0} möchte sich registrieren"
 
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr "Tipps für neue Nutzer"
-
 #: mod/register.php:93
 msgid ""
 "Registration successful. Please check your email for further instructions."
@@ -7812,121 +7832,86 @@ msgstr "Registrierung erfolgreich."
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: mod/register.php:153
+#: mod/register.php:160
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: mod/register.php:219
+#: mod/register.php:226
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."
 
-#: mod/register.php:220
+#: mod/register.php:227
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: mod/register.php:221
+#: mod/register.php:228
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: mod/register.php:235
+#: mod/register.php:242
 msgid "Include your profile in member directory?"
 msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: mod/register.php:259
+#: mod/register.php:267
+msgid "Note for the admin"
+msgstr "Hinweis für den Admin"
+
+#: mod/register.php:267
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."
+
+#: mod/register.php:268
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: mod/register.php:260
+#: mod/register.php:269
 msgid "Your invitation ID: "
 msgstr "ID Deiner Einladung: "
 
-#: mod/register.php:271
+#: mod/register.php:280
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"
 
-#: mod/register.php:272
+#: mod/register.php:281
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: mod/register.php:274 mod/settings.php:1266
+#: mod/register.php:283 mod/settings.php:1271
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: mod/register.php:274
+#: mod/register.php:283
 msgid "Leave empty for an auto generated password."
 msgstr "Leer lassen um das Passwort automatisch zu generieren."
 
-#: mod/register.php:275 mod/settings.php:1267
+#: mod/register.php:284 mod/settings.php:1272
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: mod/register.php:276
+#: mod/register.php:285
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: mod/register.php:277
+#: mod/register.php:286
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: mod/register.php:287
+#: mod/register.php:296
 msgid "Import your profile to this friendica instance"
 msgstr "Importiere Dein Profil auf diese Friendica Instanz"
 
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verbergen"
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
-
-#: mod/videos.php:120
-msgid "Do you really want to delete this video?"
-msgstr "Möchtest Du dieses Video wirklich löschen?"
-
-#: mod/videos.php:125
-msgid "Delete Video"
-msgstr "Video Löschen"
-
-#: mod/videos.php:204
-msgid "No videos selected"
-msgstr "Keine Videos  ausgewählt"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Neueste Videos"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Neues Video hochladen"
-
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr "Keine Kontakte."
-
 #: mod/settings.php:60
 msgid "Display"
 msgstr "Anzeige"
 
-#: mod/settings.php:67 mod/settings.php:884
+#: mod/settings.php:67 mod/settings.php:886
 msgid "Social Networks"
 msgstr "Soziale Netzwerke"
 
@@ -7954,675 +7939,731 @@ msgstr "E-Mail Einstellungen bearbeitet."
 msgid "Features updated"
 msgstr "Features aktualisiert"
 
-#: mod/settings.php:357
+#: mod/settings.php:359
 msgid "Relocate message has been send to your contacts"
 msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
 
-#: mod/settings.php:376
+#: mod/settings.php:378
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: mod/settings.php:384
+#: mod/settings.php:386
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
-#: mod/settings.php:395
+#: mod/settings.php:397
 msgid "Password changed."
 msgstr "Passwort geändert."
 
-#: mod/settings.php:397
+#: mod/settings.php:399
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: mod/settings.php:477
+#: mod/settings.php:479
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: mod/settings.php:479
+#: mod/settings.php:481
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: mod/settings.php:488
+#: mod/settings.php:490
 msgid "Wrong Password"
 msgstr "Falsches Passwort"
 
-#: mod/settings.php:493
+#: mod/settings.php:495
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: mod/settings.php:499
+#: mod/settings.php:501
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: mod/settings.php:555
+#: mod/settings.php:557
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
 
-#: mod/settings.php:559
+#: mod/settings.php:561
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
 
-#: mod/settings.php:599
+#: mod/settings.php:601
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: mod/settings.php:675 mod/settings.php:701 mod/settings.php:737
+#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: mod/settings.php:679 mod/settings.php:705
+#: mod/settings.php:681 mod/settings.php:707
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: mod/settings.php:680 mod/settings.php:706
+#: mod/settings.php:682 mod/settings.php:708
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: mod/settings.php:681 mod/settings.php:707
+#: mod/settings.php:683 mod/settings.php:709
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: mod/settings.php:682 mod/settings.php:708
+#: mod/settings.php:684 mod/settings.php:710
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: mod/settings.php:693
+#: mod/settings.php:695
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: mod/settings.php:736
+#: mod/settings.php:738
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: mod/settings.php:740
+#: mod/settings.php:742
 msgid "Client key starts with"
 msgstr "Anwenderschlüssel beginnt mit"
 
-#: mod/settings.php:741
+#: mod/settings.php:743
 msgid "No name"
 msgstr "Kein Name"
 
-#: mod/settings.php:742
+#: mod/settings.php:744
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: mod/settings.php:754
+#: mod/settings.php:756
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: mod/settings.php:762
+#: mod/settings.php:764
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: mod/settings.php:784
+#: mod/settings.php:786
 msgid "Additional Features"
 msgstr "Zusätzliche Features"
 
-#: mod/settings.php:794 mod/settings.php:798
+#: mod/settings.php:796 mod/settings.php:800
 msgid "General Social Media Settings"
 msgstr "Allgemeine Einstellungen zu Sozialen Medien"
 
-#: mod/settings.php:804
+#: mod/settings.php:806
 msgid "Disable intelligent shortening"
 msgstr "Intelligentes Link kürzen ausschalten"
 
-#: mod/settings.php:806
+#: mod/settings.php:808
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
 msgstr "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."
 
-#: mod/settings.php:812
+#: mod/settings.php:814
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"
 
-#: mod/settings.php:814
+#: mod/settings.php:816
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."
 
-#: mod/settings.php:820
+#: mod/settings.php:822
 msgid "Default group for OStatus contacts"
 msgstr "Voreingestellte Gruppe für OStatus Kontakte"
 
-#: mod/settings.php:826
+#: mod/settings.php:828
 msgid "Your legacy GNU Social account"
 msgstr "Dein alter GNU Social Account"
 
-#: mod/settings.php:828
+#: mod/settings.php:830
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
 
-#: mod/settings.php:831
+#: mod/settings.php:833
 msgid "Repair OStatus subscriptions"
 msgstr "OStatus Abonnements reparieren"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: mod/settings.php:841
+#: mod/settings.php:843
 msgid "GNU Social (OStatus)"
 msgstr "GNU Social (OStatus)"
 
-#: mod/settings.php:877
+#: mod/settings.php:879
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: mod/settings.php:889
+#: mod/settings.php:891
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: mod/settings.php:890
+#: mod/settings.php:892
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."
 
-#: mod/settings.php:891
+#: mod/settings.php:893
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher E-Mail Check"
 
-#: mod/settings.php:893
+#: mod/settings.php:895
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: mod/settings.php:894
+#: mod/settings.php:896
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: mod/settings.php:895
+#: mod/settings.php:897
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: mod/settings.php:895 mod/settings.php:900
+#: mod/settings.php:897 mod/settings.php:902
 msgid "None"
 msgstr "Keine"
 
-#: mod/settings.php:896
+#: mod/settings.php:898
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: mod/settings.php:897
+#: mod/settings.php:899
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: mod/settings.php:898
+#: mod/settings.php:900
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: mod/settings.php:899
+#: mod/settings.php:901
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: mod/settings.php:901
+#: mod/settings.php:903
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: mod/settings.php:990
+#: mod/settings.php:994
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: mod/settings.php:996 mod/settings.php:1018
+#: mod/settings.php:1000 mod/settings.php:1023
 msgid "Display Theme:"
 msgstr "Theme:"
 
-#: mod/settings.php:997
+#: mod/settings.php:1001
 msgid "Mobile Theme:"
 msgstr "Mobiles Theme"
 
-#: mod/settings.php:998
+#: mod/settings.php:1002
+msgid "Suppress warning of insecure networks"
+msgstr "Warnung wegen unsicheren Netzwerken unterdrücken"
+
+#: mod/settings.php:1002
+msgid ""
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
+msgstr "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."
+
+#: mod/settings.php:1003
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: mod/settings.php:998
+#: mod/settings.php:1003
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten."
 
-#: mod/settings.php:999
+#: mod/settings.php:1004
 msgid "Number of items to display per page:"
 msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
 
-#: mod/settings.php:999 mod/settings.php:1000
+#: mod/settings.php:1004 mod/settings.php:1005
 msgid "Maximum of 100 items"
 msgstr "Maximal 100 Beiträge"
 
-#: mod/settings.php:1000
+#: mod/settings.php:1005
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
 
-#: mod/settings.php:1001
+#: mod/settings.php:1006
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: mod/settings.php:1002
+#: mod/settings.php:1007
 msgid "Calendar"
 msgstr "Kalender"
 
-#: mod/settings.php:1003
+#: mod/settings.php:1008
 msgid "Beginning of week:"
 msgstr "Wochenbeginn:"
 
-#: mod/settings.php:1004
+#: mod/settings.php:1009
 msgid "Don't show notices"
 msgstr "Info-Popups nicht anzeigen"
 
-#: mod/settings.php:1005
+#: mod/settings.php:1010
 msgid "Infinite scroll"
 msgstr "Endloses Scrollen"
 
-#: mod/settings.php:1006
+#: mod/settings.php:1011
 msgid "Automatic updates only at the top of the network page"
 msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid "Bandwith Saver Mode"
 msgstr "Bandbreiten-Spar-Modus"
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."
 
-#: mod/settings.php:1009
+#: mod/settings.php:1014
 msgid "General Theme Settings"
 msgstr "Allgemeine Themeneinstellungen"
 
-#: mod/settings.php:1010
+#: mod/settings.php:1015
 msgid "Custom Theme Settings"
 msgstr "Benutzerdefinierte Theme Einstellungen"
 
-#: mod/settings.php:1011
+#: mod/settings.php:1016
 msgid "Content Settings"
 msgstr "Einstellungen zum Inhalt"
 
-#: mod/settings.php:1012 view/theme/frio/config.php:61
-#: view/theme/cleanzero/config.php:82 view/theme/quattro/config.php:66
-#: view/theme/dispy/config.php:72 view/theme/vier/config.php:109
-#: view/theme/diabook/config.php:150 view/theme/duepuntozero/config.php:61
+#: mod/settings.php:1017 view/theme/frio/config.php:61
+#: view/theme/quattro/config.php:66 view/theme/vier/config.php:109
+#: view/theme/duepuntozero/config.php:61
 msgid "Theme settings"
 msgstr "Themeneinstellungen"
 
-#: mod/settings.php:1094
+#: mod/settings.php:1099
 msgid "Account Types"
 msgstr "Kontenarten"
 
-#: mod/settings.php:1095
+#: mod/settings.php:1100
 msgid "Personal Page Subtypes"
 msgstr "Unterarten der persönlichen Seite"
 
-#: mod/settings.php:1096
+#: mod/settings.php:1101
 msgid "Community Forum Subtypes"
 msgstr "Unterarten des Gemeinschaftsforums"
 
-#: mod/settings.php:1103
+#: mod/settings.php:1108
 msgid "Personal Page"
 msgstr "Persönliche Seite"
 
-#: mod/settings.php:1104
+#: mod/settings.php:1109
 msgid "This account is a regular personal profile"
 msgstr "Dieses Konto ist ein normales persönliches Profil"
 
-#: mod/settings.php:1107
+#: mod/settings.php:1112
 msgid "Organisation Page"
 msgstr "Organisationsseite"
 
-#: mod/settings.php:1108
+#: mod/settings.php:1113
 msgid "This account is a profile for an organisation"
 msgstr "Diese Konto ist ein Profil für eine Organisation"
 
-#: mod/settings.php:1111
+#: mod/settings.php:1116
 msgid "News Page"
 msgstr "Nachrichtenseite"
 
-#: mod/settings.php:1112
+#: mod/settings.php:1117
 msgid "This account is a news account/reflector"
 msgstr "Dieses Konto ist ein News-Konto bzw. -Spiegel"
 
-#: mod/settings.php:1115
+#: mod/settings.php:1120
 msgid "Community Forum"
 msgstr "Gemeinschaftsforum"
 
-#: mod/settings.php:1116
+#: mod/settings.php:1121
 msgid ""
 "This account is a community forum where people can discuss with each other"
 msgstr "Dieses Konto ist ein Gemeinschaftskonto wo sich Leute untereinander austauschen können"
 
-#: mod/settings.php:1119
+#: mod/settings.php:1124
 msgid "Normal Account Page"
 msgstr "Normales Konto"
 
-#: mod/settings.php:1120
+#: mod/settings.php:1125
 msgid "This account is a normal personal profile"
 msgstr "Dieses Konto ist ein normales persönliches Profil"
 
-#: mod/settings.php:1123
+#: mod/settings.php:1128
 msgid "Soapbox Page"
 msgstr "Marktschreier-Konto"
 
-#: mod/settings.php:1124
+#: mod/settings.php:1129
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: mod/settings.php:1127
+#: mod/settings.php:1132
 msgid "Public Forum"
 msgstr "Öffentliches Forum"
 
-#: mod/settings.php:1128
+#: mod/settings.php:1133
 msgid "Automatically approve all contact requests"
 msgstr "Bestätige alle Kontaktanfragen automatisch"
 
-#: mod/settings.php:1131
+#: mod/settings.php:1136
 msgid "Automatic Friend Page"
 msgstr "Automatische Freunde Seite"
 
-#: mod/settings.php:1132
+#: mod/settings.php:1137
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
 
-#: mod/settings.php:1135
+#: mod/settings.php:1140
 msgid "Private Forum [Experimental]"
 msgstr "Privates Forum [Versuchsstadium]"
 
-#: mod/settings.php:1136
+#: mod/settings.php:1141
 msgid "Private forum - approved members only"
 msgstr "Privates Forum, nur für Mitglieder"
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
-#: mod/settings.php:1158
+#: mod/settings.php:1163
 msgid "Publish your default profile in your local site directory?"
 msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
 
-#: mod/settings.php:1164
+#: mod/settings.php:1169
 msgid "Publish your default profile in the global social directory?"
 msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
-#: mod/settings.php:1172
+#: mod/settings.php:1177
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: mod/settings.php:1176
+#: mod/settings.php:1181
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich"
 
-#: mod/settings.php:1181
+#: mod/settings.php:1186
 msgid "Allow friends to post to your profile page?"
 msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
 
-#: mod/settings.php:1187
+#: mod/settings.php:1192
 msgid "Allow friends to tag your posts?"
 msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
 
-#: mod/settings.php:1193
+#: mod/settings.php:1198
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: mod/settings.php:1199
+#: mod/settings.php:1204
 msgid "Permit unknown people to send you private mail?"
 msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1212
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: mod/settings.php:1215
+#: mod/settings.php:1220
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: mod/settings.php:1223
+#: mod/settings.php:1228
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: mod/settings.php:1224
+#: mod/settings.php:1229
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: mod/settings.php:1225
+#: mod/settings.php:1230
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: mod/settings.php:1226
+#: mod/settings.php:1231
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: mod/settings.php:1227
+#: mod/settings.php:1232
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: mod/settings.php:1228
+#: mod/settings.php:1233
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: mod/settings.php:1229
+#: mod/settings.php:1234
 msgid "Only expire posts by others:"
 msgstr "Nur Beiträge anderer verfallen:"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1262
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: mod/settings.php:1265
+#: mod/settings.php:1270
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: mod/settings.php:1267
+#: mod/settings.php:1272
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
 
-#: mod/settings.php:1268
+#: mod/settings.php:1273
 msgid "Current Password:"
 msgstr "Aktuelles Passwort:"
 
-#: mod/settings.php:1268 mod/settings.php:1269
+#: mod/settings.php:1273 mod/settings.php:1274
 msgid "Your current password to confirm the changes"
 msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
 
-#: mod/settings.php:1269
+#: mod/settings.php:1274
 msgid "Password:"
 msgstr "Passwort:"
 
-#: mod/settings.php:1273
+#: mod/settings.php:1278
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: mod/settings.php:1275
+#: mod/settings.php:1280
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: mod/settings.php:1276
+#: mod/settings.php:1281
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid "Your Language:"
 msgstr "Deine Sprache:"
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"
 
-#: mod/settings.php:1278
+#: mod/settings.php:1283
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: mod/settings.php:1279
+#: mod/settings.php:1284
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: mod/settings.php:1282
+#: mod/settings.php:1287
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: mod/settings.php:1284
+#: mod/settings.php:1289
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
 
-#: mod/settings.php:1284 mod/settings.php:1314
+#: mod/settings.php:1289 mod/settings.php:1319
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: mod/settings.php:1285
+#: mod/settings.php:1290
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: mod/settings.php:1286
+#: mod/settings.php:1291
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: mod/settings.php:1297
+#: mod/settings.php:1302
 msgid "Default Private Post"
 msgstr "Privater Standardbeitrag"
 
-#: mod/settings.php:1298
+#: mod/settings.php:1303
 msgid "Default Public Post"
 msgstr "Öffentlicher Standardbeitrag"
 
-#: mod/settings.php:1302
+#: mod/settings.php:1307
 msgid "Default Permissions for New Posts"
 msgstr "Standardberechtigungen für neue Beiträge"
 
-#: mod/settings.php:1314
+#: mod/settings.php:1319
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
 
-#: mod/settings.php:1317
+#: mod/settings.php:1322
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: mod/settings.php:1318
+#: mod/settings.php:1323
 msgid "By default post a status message when:"
 msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
 
-#: mod/settings.php:1319
+#: mod/settings.php:1324
 msgid "accepting a friend request"
 msgstr "– Du eine Kontaktanfrage akzeptierst"
 
-#: mod/settings.php:1320
+#: mod/settings.php:1325
 msgid "joining a forum/community"
 msgstr "– Du einem Forum/einer Gemeinschaftsseite beitrittst"
 
-#: mod/settings.php:1321
+#: mod/settings.php:1326
 msgid "making an <em>interesting</em> profile change"
 msgstr "– Du eine <em>interessante</em> Änderung an Deinem Profil durchführst"
 
-#: mod/settings.php:1322
+#: mod/settings.php:1327
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: mod/settings.php:1323
+#: mod/settings.php:1328
 msgid "You receive an introduction"
 msgstr "– Du eine Kontaktanfrage erhältst"
 
-#: mod/settings.php:1324
+#: mod/settings.php:1329
 msgid "Your introductions are confirmed"
 msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
 
-#: mod/settings.php:1325
+#: mod/settings.php:1330
 msgid "Someone writes on your profile wall"
 msgstr "– jemand etwas auf Deine Pinnwand schreibt"
 
-#: mod/settings.php:1326
+#: mod/settings.php:1331
 msgid "Someone writes a followup comment"
 msgstr "– jemand auch einen Kommentar verfasst"
 
-#: mod/settings.php:1327
+#: mod/settings.php:1332
 msgid "You receive a private message"
 msgstr "– Du eine private Nachricht erhältst"
 
-#: mod/settings.php:1328
+#: mod/settings.php:1333
 msgid "You receive a friend suggestion"
 msgstr "– Du eine Empfehlung erhältst"
 
-#: mod/settings.php:1329
+#: mod/settings.php:1334
 msgid "You are tagged in a post"
 msgstr "– Du in einem Beitrag erwähnt wirst"
 
-#: mod/settings.php:1330
+#: mod/settings.php:1335
 msgid "You are poked/prodded/etc. in a post"
 msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Activate desktop notifications"
 msgstr "Desktop Benachrichtigungen einschalten"
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Show desktop popup on new notifications"
 msgstr "Desktop Benachrichtigungen einschalten"
 
-#: mod/settings.php:1334
+#: mod/settings.php:1339
 msgid "Text-only notification emails"
 msgstr "Benachrichtigungs E-Mail als Rein-Text."
 
-#: mod/settings.php:1336
+#: mod/settings.php:1341
 msgid "Send text only notification emails, without the html part"
 msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
 
-#: mod/settings.php:1338
+#: mod/settings.php:1343
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 
-#: mod/settings.php:1339
+#: mod/settings.php:1344
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
-#: mod/settings.php:1342
+#: mod/settings.php:1347
 msgid "Relocate"
 msgstr "Umziehen"
 
-#: mod/settings.php:1343
+#: mod/settings.php:1348
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."
 
-#: mod/settings.php:1344
+#: mod/settings.php:1349
 msgid "Resend relocate message to contacts"
 msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
 
+#: mod/videos.php:120
+msgid "Do you really want to delete this video?"
+msgstr "Möchtest Du dieses Video wirklich löschen?"
+
+#: mod/videos.php:125
+msgid "Delete Video"
+msgstr "Video Löschen"
+
+#: mod/videos.php:204
+msgid "No videos selected"
+msgstr "Keine Videos  ausgewählt"
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr "Neueste Videos"
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr "Neues Video hochladen"
+
+#: mod/viewcontacts.php:72
+msgid "No contacts."
+msgstr "Keine Kontakte."
+
+#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
+#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
+#: mod/wall_upload.php:122 mod/wall_upload.php:125
+msgid "Invalid request."
+msgstr "Ungültige Anfrage"
+
+#: mod/wall_attach.php:94
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."
+
+#: mod/wall_attach.php:94
+msgid "Or - did you try to upload an empty file?"
+msgstr "Oder - hast Du versucht, eine leere Datei hochzuladen?"
+
+#: mod/wall_attach.php:105
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Die Datei ist größer als das erlaubte Limit von %s"
+
+#: mod/wall_attach.php:156 mod/wall_attach.php:172
+msgid "File upload failed."
+msgstr "Hochladen der Datei fehlgeschlagen."
+
 #: object/Item.php:370
 msgid "via"
 msgstr "via"
@@ -8707,23 +8748,6 @@ msgstr "Gast"
 msgid "Visitor"
 msgstr "Besucher"
 
-#: view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
-msgstr "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"
-
-#: view/theme/cleanzero/config.php:84 view/theme/dispy/config.php:73
-#: view/theme/diabook/config.php:151
-msgid "Set font-size for posts and comments"
-msgstr "Schriftgröße für Beiträge und Kommentare festlegen"
-
-#: view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr "Theme Breite festlegen"
-
-#: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr "Farbschema"
-
 #: view/theme/quattro/config.php:67
 msgid "Alignment"
 msgstr "Ausrichtung"
@@ -8736,6 +8760,10 @@ msgstr "Links"
 msgid "Center"
 msgstr "Mitte"
 
+#: view/theme/quattro/config.php:68
+msgid "Color scheme"
+msgstr "Farbschema"
+
 #: view/theme/quattro/config.php:69
 msgid "Posts font size"
 msgstr "Schriftgröße in Beiträgen"
@@ -8744,33 +8772,19 @@ msgstr "Schriftgröße in Beiträgen"
 msgid "Textareas font size"
 msgstr "Schriftgröße in Eingabefeldern"
 
-#: view/theme/dispy/config.php:74 view/theme/diabook/config.php:152
-msgid "Set line-height for posts and comments"
-msgstr "Liniengröße für Beiträge und Kommantare festlegen"
-
-#: view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr "Farbschema wählen"
-
 #: view/theme/vier/theme.php:152 view/theme/vier/config.php:112
-#: view/theme/diabook/theme.php:391 view/theme/diabook/theme.php:626
-#: view/theme/diabook/config.php:160
 msgid "Community Profiles"
 msgstr "Community-Profile"
 
 #: view/theme/vier/theme.php:181 view/theme/vier/config.php:116
-#: view/theme/diabook/theme.php:412 view/theme/diabook/theme.php:630
-#: view/theme/diabook/config.php:164
 msgid "Last users"
 msgstr "Letzte Nutzer"
 
 #: view/theme/vier/theme.php:199 view/theme/vier/config.php:115
-#: view/theme/diabook/theme.php:523 view/theme/diabook/theme.php:629
-#: view/theme/diabook/config.php:163
 msgid "Find Friends"
 msgstr "Kontakte finden"
 
-#: view/theme/vier/theme.php:200 view/theme/diabook/theme.php:524
+#: view/theme/vier/theme.php:200
 msgid "Local Directory"
 msgstr "Lokales Verzeichnis"
 
@@ -8779,8 +8793,6 @@ msgid "Quick Start"
 msgstr "Schnell-Start"
 
 #: view/theme/vier/theme.php:373 view/theme/vier/config.php:114
-#: view/theme/diabook/theme.php:606 view/theme/diabook/theme.php:628
-#: view/theme/diabook/config.php:162
 msgid "Connect Services"
 msgstr "Verbinde Dienste"
 
@@ -8792,68 +8804,14 @@ msgstr "Komma-Separierte Liste der Helfer-Foren"
 msgid "Set style"
 msgstr "Stil auswählen"
 
-#: view/theme/vier/config.php:111 view/theme/diabook/theme.php:130
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
-#: view/theme/diabook/config.php:158
+#: view/theme/vier/config.php:111
 msgid "Community Pages"
 msgstr "Foren"
 
-#: view/theme/vier/config.php:113 view/theme/diabook/theme.php:599
-#: view/theme/diabook/theme.php:627 view/theme/diabook/config.php:161
+#: view/theme/vier/config.php:113
 msgid "Help or @NewHere ?"
 msgstr "Hilfe oder @NewHere"
 
-#: view/theme/diabook/theme.php:125
-msgid "Your contacts"
-msgstr "Deine Kontakte"
-
-#: view/theme/diabook/theme.php:128
-msgid "Your personal photos"
-msgstr "Deine privaten Fotos"
-
-#: view/theme/diabook/theme.php:441 view/theme/diabook/theme.php:632
-#: view/theme/diabook/config.php:166
-msgid "Last likes"
-msgstr "Zuletzt gemocht"
-
-#: view/theme/diabook/theme.php:486 view/theme/diabook/theme.php:631
-#: view/theme/diabook/config.php:165
-msgid "Last photos"
-msgstr "Letzte Fotos"
-
-#: view/theme/diabook/theme.php:579 view/theme/diabook/theme.php:625
-#: view/theme/diabook/config.php:159
-msgid "Earth Layers"
-msgstr "Earth Layers"
-
-#: view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
-msgstr "Zoomfaktor der Earth Layer"
-
-#: view/theme/diabook/theme.php:585 view/theme/diabook/config.php:156
-msgid "Set longitude (X) for Earth Layers"
-msgstr "Longitude (X) der Earth Layer"
-
-#: view/theme/diabook/theme.php:586 view/theme/diabook/config.php:157
-msgid "Set latitude (Y) for Earth Layers"
-msgstr "Latitude (Y) der Earth Layer"
-
-#: view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
-msgstr "Rahmen auf der rechten Seite anzeigen/verbergen"
-
-#: view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
-msgstr "Auflösung für die Mittelspalte setzen"
-
-#: view/theme/diabook/config.php:154
-msgid "Set color scheme"
-msgstr "Wähle Farbschema"
-
-#: view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
-msgstr "Zoomfaktor der Earth Layer"
-
 #: view/theme/duepuntozero/config.php:45
 msgid "greenzero"
 msgstr "greenzero"
@@ -8886,51 +8844,51 @@ msgstr "Variationen"
 msgid "toggle mobile"
 msgstr "auf/von Mobile Ansicht wechseln"
 
-#: boot.php:968
+#: boot.php:969
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: boot.php:971
+#: boot.php:972
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: boot.php:1641
+#: boot.php:1650
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: boot.php:1753
+#: boot.php:1762
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: boot.php:1782
+#: boot.php:1791
 msgid "Password: "
 msgstr "Passwort: "
 
-#: boot.php:1783
+#: boot.php:1792
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: boot.php:1786
+#: boot.php:1795
 msgid "Or login using OpenID: "
 msgstr "Oder melde Dich mit Deiner OpenID an: "
 
-#: boot.php:1792
+#: boot.php:1801
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: boot.php:1795
+#: boot.php:1804
 msgid "Website Terms of Service"
 msgstr "Website Nutzungsbedingungen"
 
-#: boot.php:1796
+#: boot.php:1805
 msgid "terms of service"
 msgstr "Nutzungsbedingungen"
 
-#: boot.php:1798
+#: boot.php:1807
 msgid "Website Privacy Policy"
 msgstr "Website Datenschutzerklärung"
 
-#: boot.php:1799
+#: boot.php:1808
 msgid "privacy policy"
 msgstr "Datenschutzerklärung"

view/lang/de/strings.php

@@ -115,28 +115,6 @@ $a->strings["Create a new group"] = "Neue Gruppe erstellen";
 $a->strings["Group Name: "] = "Gruppenname:";
 $a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
 $a->strings["add"] = "hinzufügen";
-$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
-$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
-$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
-$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
-$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
-$a->strings["Name too short."] = "Der Name ist zu kurz.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
-$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
-$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen.";
-$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
-$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["default"] = "Standard";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["Profile Photos"] = "Profilbilder";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
-$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
-$a->strings["Registration details for %s"] = "Details der Registration von %s";
 $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
 $a->strings["Block immediately"] = "Sofort blockieren";
 $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller";
@@ -166,7 +144,6 @@ $a->strings["Diaspora Connector"] = "Diaspora";
 $a->strings["GNU Social"] = "GNU Social";
 $a->strings["App.net"] = "App.net";
 $a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix";
-$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
 $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
@@ -201,24 +178,6 @@ $a->strings["%d contact not imported"] = array(
 	1 => "%d Kontakte nicht importiert",
 );
 $a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden";
-$a->strings["System"] = "System";
-$a->strings["Network"] = "Netzwerk";
-$a->strings["Personal"] = "Persönlich";
-$a->strings["Home"] = "Pinnwand";
-$a->strings["Introductions"] = "Kontaktanfragen";
-$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
-$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
-$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
-$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
-$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
-$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
-$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
-$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
-$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
-$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
-$a->strings["New Follower"] = "Neuer Bewunderer";
-$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
-$a->strings["Attachments:"] = "Anhänge:";
 $a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
 $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
@@ -269,115 +228,10 @@ $a->strings["Mute Post Notifications"] = "Benachrichtigungen für Beiträge Stum
 $a->strings["Ability to mute notifications for a thread"] = "Möglichkeit Benachrichtigungen für einen Thread abbestellen zu können";
 $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen";
 $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite";
-$a->strings["(no subject)"] = "(kein Betreff)";
-$a->strings["noreply"] = "noreply";
-$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
-$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
-$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
 $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
-$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
-$a->strings["post/item"] = "Nachricht/Beitrag";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
-$a->strings["Likes"] = "Likes";
-$a->strings["Dislikes"] = "Dislikes";
-$a->strings["Attending"] = array(
-	0 => "Teilnehmend",
-	1 => "Teilnehmend",
-);
-$a->strings["Not attending"] = "Nicht teilnehmend";
-$a->strings["Might attend"] = "Eventuell teilnehmend";
-$a->strings["Select"] = "Auswählen";
-$a->strings["Delete"] = "Löschen";
-$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
-$a->strings["Categories:"] = "Kategorien:";
-$a->strings["Filed under:"] = "Abgelegt unter:";
-$a->strings["%s from %s"] = "%s von %s";
-$a->strings["View in context"] = "Im Zusammenhang betrachten";
-$a->strings["Please wait"] = "Bitte warten";
-$a->strings["remove"] = "löschen";
-$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
-$a->strings["Follow Thread"] = "Folge der Unterhaltung";
-$a->strings["View Status"] = "Pinnwand anschauen";
-$a->strings["View Profile"] = "Profil anschauen";
-$a->strings["View Photos"] = "Bilder anschauen";
-$a->strings["Network Posts"] = "Netzwerkbeiträge";
-$a->strings["View Contact"] = "Kontakt anzeigen";
-$a->strings["Send PM"] = "Private Nachricht senden";
-$a->strings["Poke"] = "Anstupsen";
-$a->strings["%s likes this."] = "%s mag das.";
-$a->strings["%s doesn't like this."] = "%s mag das nicht.";
-$a->strings["%s attends."] = "%s nimmt teil.";
-$a->strings["%s doesn't attend."] = "%s nimmt nicht teil.";
-$a->strings["%s attends maybe."] = "%s nimmt eventuell teil.";
-$a->strings["and"] = "und";
-$a->strings[", and %d other people"] = " und %d andere";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das";
-$a->strings["%s like this."] = "%s mögen das.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das nicht";
-$a->strings["%s don't like this."] = "%s mögen dies nicht.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span %1\$s>%2\$d Personen</span> nehmen teil";
-$a->strings["%s attend."] = "%s nehmen teil.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span %1\$s>%2\$d Personen</span> nehmen nicht teil";
-$a->strings["%s don't attend."] = "%s nehmen nicht teil.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span %1\$s>%2\$d Personen</span> nehmen eventuell teil";
-$a->strings["%s anttend maybe."] = "%s  nehmen vielleicht teil.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</strong> sichtbar";
-$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
-$a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
-$a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
-$a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
-$a->strings["Where are you right now?"] = "Wo hältst Du Dich jetzt gerade auf?";
-$a->strings["Delete item(s)?"] = "Einträge löschen?";
-$a->strings["Share"] = "Teilen";
-$a->strings["Upload photo"] = "Foto hochladen";
-$a->strings["upload photo"] = "Bild hochladen";
-$a->strings["Attach file"] = "Datei anhängen";
-$a->strings["attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "Einen Link einfügen";
-$a->strings["web link"] = "Weblink";
-$a->strings["Insert video link"] = "Video-Adresse einfügen";
-$a->strings["video link"] = "Video-Link";
-$a->strings["Insert audio link"] = "Audio-Adresse einfügen";
-$a->strings["audio link"] = "Audio-Link";
-$a->strings["Set your location"] = "Deinen Standort festlegen";
-$a->strings["set location"] = "Ort setzen";
-$a->strings["Clear browser location"] = "Browser-Standort leeren";
-$a->strings["clear location"] = "Ort löschen";
-$a->strings["Set title"] = "Titel setzen";
-$a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)";
-$a->strings["Permission settings"] = "Berechtigungseinstellungen";
-$a->strings["permissions"] = "Zugriffsrechte";
-$a->strings["Public post"] = "Öffentlicher Beitrag";
-$a->strings["Preview"] = "Vorschau";
-$a->strings["Cancel"] = "Abbrechen";
-$a->strings["Post to Groups"] = "Poste an Gruppe";
-$a->strings["Post to Contacts"] = "Poste an Kontakte";
-$a->strings["Private post"] = "Privater Beitrag";
-$a->strings["Message"] = "Nachricht";
-$a->strings["Browser"] = "Browser";
-$a->strings["View all"] = "Zeige alle";
-$a->strings["Like"] = array(
-	0 => "mag ich",
-	1 => "Mag ich",
-);
-$a->strings["Dislike"] = array(
-	0 => "mag ich nicht",
-	1 => "Mag ich nicht",
-);
-$a->strings["Not Attending"] = array(
-	0 => "Nicht teilnehmend ",
-	1 => "Nicht teilnehmend",
-);
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["Age: "] = "Alter: ";
@@ -401,15 +255,11 @@ $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
 $a->strings["%s's birthday"] = "%ss Geburtstag";
 $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
-$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
-$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
-$a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten.";
-$a->strings["%s\\'s birthday"] = "%ss Geburtstag";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
+$a->strings["noreply"] = "noreply";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Nachricht erhalten von %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neue private Nachricht auf %2\$s geschickt.";
@@ -524,11 +374,214 @@ $a->strings["The profile address specified belongs to a network which has been d
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
 $a->strings["following"] = "folgen";
+$a->strings["Nothing new here"] = "Keine Neuigkeiten";
+$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen";
+$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
+$a->strings["Logout"] = "Abmelden";
+$a->strings["End this session"] = "Diese Sitzung beenden";
+$a->strings["Status"] = "Status";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Profile"] = "Profil";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Your photos"] = "Deine Fotos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Your videos"] = "Deine Videos";
+$a->strings["Events"] = "Veranstaltungen";
+$a->strings["Your events"] = "Deine Ereignisse";
+$a->strings["Personal notes"] = "Persönliche Notizen";
+$a->strings["Your personal notes"] = "Deine persönlichen Notizen";
+$a->strings["Login"] = "Anmeldung";
+$a->strings["Sign in"] = "Anmelden";
+$a->strings["Home"] = "Pinnwand";
+$a->strings["Home Page"] = "Homepage";
+$a->strings["Register"] = "Registrieren";
+$a->strings["Create an account"] = "Nutzerkonto erstellen";
+$a->strings["Help"] = "Hilfe";
+$a->strings["Help and documentation"] = "Hilfe und Dokumentation";
+$a->strings["Apps"] = "Apps";
+$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele";
+$a->strings["Search"] = "Suche";
+$a->strings["Search site content"] = "Inhalt der Seite durchsuchen";
+$a->strings["Full Text"] = "Volltext";
+$a->strings["Tags"] = "Tags";
+$a->strings["Contacts"] = "Kontakte";
+$a->strings["Community"] = "Gemeinschaft";
+$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite";
+$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk";
+$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
+$a->strings["Directory"] = "Verzeichnis";
+$a->strings["People directory"] = "Nutzerverzeichnis";
+$a->strings["Information"] = "Information";
+$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz";
+$a->strings["Network"] = "Netzwerk";
+$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
+$a->strings["Network Reset"] = "Netzwerk zurücksetzen";
+$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden";
+$a->strings["Introductions"] = "Kontaktanfragen";
+$a->strings["Friend Requests"] = "Kontaktanfragen";
+$a->strings["Notifications"] = "Benachrichtigungen";
+$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
+$a->strings["Mark as seen"] = "Als gelesen markieren";
+$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen";
+$a->strings["Messages"] = "Nachrichten";
+$a->strings["Private mail"] = "Private E-Mail";
+$a->strings["Inbox"] = "Eingang";
+$a->strings["Outbox"] = "Ausgang";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Manage"] = "Verwalten";
+$a->strings["Manage other pages"] = "Andere Seiten verwalten";
+$a->strings["Delegations"] = "Delegationen";
+$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Account settings"] = "Kontoeinstellungen";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
+$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren";
+$a->strings["Admin"] = "Administration";
+$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
+$a->strings["Navigation"] = "Navigation";
+$a->strings["Site map"] = "Sitemap";
+$a->strings["Embedded content"] = "Eingebetteter Inhalt";
+$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Contact Photos"] = "Kontaktbilder";
+$a->strings["Welcome "] = "Willkommen ";
+$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
+$a->strings["Welcome back "] = "Willkommen zurück ";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
+$a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerkbeiträge";
+$a->strings["View Contact"] = "Kontakt anzeigen";
+$a->strings["Drop Contact"] = "Kontakt löschen";
+$a->strings["Send PM"] = "Private Nachricht senden";
+$a->strings["Poke"] = "Anstupsen";
+$a->strings["Organisation"] = "Organisation";
+$a->strings["News"] = "Nachrichten";
+$a->strings["Forum"] = "Forum";
+$a->strings["System"] = "System";
+$a->strings["Personal"] = "Persönlich";
+$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
+$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
+$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
+$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
+$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
+$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
+$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
+$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
+$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
+$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
+$a->strings["New Follower"] = "Neuer Bewunderer";
+$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
+$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
+$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
+$a->strings["post/item"] = "Nachricht/Beitrag";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
+$a->strings["Likes"] = "Likes";
+$a->strings["Dislikes"] = "Dislikes";
+$a->strings["Attending"] = array(
+	0 => "Teilnehmend",
+	1 => "Teilnehmend",
+);
+$a->strings["Not attending"] = "Nicht teilnehmend";
+$a->strings["Might attend"] = "Eventuell teilnehmend";
+$a->strings["Select"] = "Auswählen";
+$a->strings["Delete"] = "Löschen";
+$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
+$a->strings["Categories:"] = "Kategorien:";
+$a->strings["Filed under:"] = "Abgelegt unter:";
+$a->strings["%s from %s"] = "%s von %s";
+$a->strings["View in context"] = "Im Zusammenhang betrachten";
+$a->strings["Please wait"] = "Bitte warten";
+$a->strings["remove"] = "löschen";
+$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
+$a->strings["Follow Thread"] = "Folge der Unterhaltung";
+$a->strings["%s likes this."] = "%s mag das.";
+$a->strings["%s doesn't like this."] = "%s mag das nicht.";
+$a->strings["%s attends."] = "%s nimmt teil.";
+$a->strings["%s doesn't attend."] = "%s nimmt nicht teil.";
+$a->strings["%s attends maybe."] = "%s nimmt eventuell teil.";
+$a->strings["and"] = "und";
+$a->strings[", and %d other people"] = " und %d andere";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das";
+$a->strings["%s like this."] = "%s mögen das.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das nicht";
+$a->strings["%s don't like this."] = "%s mögen dies nicht.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span %1\$s>%2\$d Personen</span> nehmen teil";
+$a->strings["%s attend."] = "%s nehmen teil.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span %1\$s>%2\$d Personen</span> nehmen nicht teil";
+$a->strings["%s don't attend."] = "%s nehmen nicht teil.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span %1\$s>%2\$d Personen</span> nehmen eventuell teil";
+$a->strings["%s anttend maybe."] = "%s  nehmen vielleicht teil.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</strong> sichtbar";
+$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
+$a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
+$a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
+$a->strings["Tag term:"] = "Tag:";
+$a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
+$a->strings["Where are you right now?"] = "Wo hältst Du Dich jetzt gerade auf?";
+$a->strings["Delete item(s)?"] = "Einträge löschen?";
+$a->strings["Share"] = "Teilen";
+$a->strings["Upload photo"] = "Foto hochladen";
+$a->strings["upload photo"] = "Bild hochladen";
+$a->strings["Attach file"] = "Datei anhängen";
+$a->strings["attach file"] = "Datei anhängen";
+$a->strings["Insert web link"] = "Einen Link einfügen";
+$a->strings["web link"] = "Weblink";
+$a->strings["Insert video link"] = "Video-Adresse einfügen";
+$a->strings["video link"] = "Video-Link";
+$a->strings["Insert audio link"] = "Audio-Adresse einfügen";
+$a->strings["audio link"] = "Audio-Link";
+$a->strings["Set your location"] = "Deinen Standort festlegen";
+$a->strings["set location"] = "Ort setzen";
+$a->strings["Clear browser location"] = "Browser-Standort leeren";
+$a->strings["clear location"] = "Ort löschen";
+$a->strings["Set title"] = "Titel setzen";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)";
+$a->strings["Permission settings"] = "Berechtigungseinstellungen";
+$a->strings["permissions"] = "Zugriffsrechte";
+$a->strings["Public post"] = "Öffentlicher Beitrag";
+$a->strings["Preview"] = "Vorschau";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Post to Groups"] = "Poste an Gruppe";
+$a->strings["Post to Contacts"] = "Poste an Kontakte";
+$a->strings["Private post"] = "Privater Beitrag";
+$a->strings["Message"] = "Nachricht";
+$a->strings["Browser"] = "Browser";
+$a->strings["View all"] = "Zeige alle";
+$a->strings["Like"] = array(
+	0 => "mag ich",
+	1 => "Mag ich",
+);
+$a->strings["Dislike"] = array(
+	0 => "mag ich nicht",
+	1 => "Mag ich nicht",
+);
+$a->strings["Not Attending"] = array(
+	0 => "Nicht teilnehmend ",
+	1 => "Nicht teilnehmend",
+);
+$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
+$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
+$a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten.";
+$a->strings["(no subject)"] = "(kein Betreff)";
+$a->strings["%s\\'s birthday"] = "%ss Geburtstag";
+$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
+$a->strings["Attachments:"] = "Anhänge:";
 $a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
 $a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
 $a->strings["Edit profile"] = "Profil bearbeiten";
 $a->strings["Atom feed"] = "Atom-Feed";
-$a->strings["Profiles"] = "Profile";
 $a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
 $a->strings["Change profile photo"] = "Profilbild ändern";
 $a->strings["Create New Profile"] = "Neues Profil anlegen";
@@ -549,7 +602,6 @@ $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
 $a->strings["[No description]"] = "[keine Beschreibung]";
 $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
 $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
-$a->strings["Profile"] = "Profil";
 $a->strings["Full Name:"] = "Kompletter Name:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -574,87 +626,18 @@ $a->strings["School/education:"] = "Schule/Ausbildung:";
 $a->strings["Forums:"] = "Foren:";
 $a->strings["Basic"] = "Allgemein";
 $a->strings["Advanced"] = "Erweitert";
-$a->strings["Status"] = "Status";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["Profile Details"] = "Profildetails";
-$a->strings["Photos"] = "Bilder";
 $a->strings["Photo Albums"] = "Fotoalben";
-$a->strings["Videos"] = "Videos";
-$a->strings["Events"] = "Veranstaltungen";
-$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
-$a->strings["Contacts"] = "Kontakte";
 $a->strings["[Name Withheld]"] = "[Name unterdrückt]";
 $a->strings["Item not found."] = "Beitrag nicht gefunden.";
 $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
 $a->strings["Yes"] = "Ja";
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Archives"] = "Archiv";
-$a->strings["Nothing new here"] = "Keine Neuigkeiten";
-$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen";
-$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
-$a->strings["Logout"] = "Abmelden";
-$a->strings["End this session"] = "Diese Sitzung beenden";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Your photos"] = "Deine Fotos";
-$a->strings["Your videos"] = "Deine Videos";
-$a->strings["Your events"] = "Deine Ereignisse";
-$a->strings["Personal notes"] = "Persönliche Notizen";
-$a->strings["Your personal notes"] = "Deine persönlichen Notizen";
-$a->strings["Login"] = "Anmeldung";
-$a->strings["Sign in"] = "Anmelden";
-$a->strings["Home Page"] = "Homepage";
-$a->strings["Register"] = "Registrieren";
-$a->strings["Create an account"] = "Nutzerkonto erstellen";
-$a->strings["Help"] = "Hilfe";
-$a->strings["Help and documentation"] = "Hilfe und Dokumentation";
-$a->strings["Apps"] = "Apps";
-$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele";
-$a->strings["Search"] = "Suche";
-$a->strings["Search site content"] = "Inhalt der Seite durchsuchen";
-$a->strings["Full Text"] = "Volltext";
-$a->strings["Tags"] = "Tags";
-$a->strings["Community"] = "Gemeinschaft";
-$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite";
-$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk";
-$a->strings["Directory"] = "Verzeichnis";
-$a->strings["People directory"] = "Nutzerverzeichnis";
-$a->strings["Information"] = "Information";
-$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz";
-$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
-$a->strings["Network Reset"] = "Netzwerk zurücksetzen";
-$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden";
-$a->strings["Friend Requests"] = "Kontaktanfragen";
-$a->strings["Notifications"] = "Benachrichtigungen";
-$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
-$a->strings["Mark as seen"] = "Als gelesen markieren";
-$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen";
-$a->strings["Messages"] = "Nachrichten";
-$a->strings["Private mail"] = "Private E-Mail";
-$a->strings["Inbox"] = "Eingang";
-$a->strings["Outbox"] = "Ausgang";
-$a->strings["New Message"] = "Neue Nachricht";
-$a->strings["Manage"] = "Verwalten";
-$a->strings["Manage other pages"] = "Andere Seiten verwalten";
-$a->strings["Delegations"] = "Delegationen";
-$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
-$a->strings["Settings"] = "Einstellungen";
-$a->strings["Account settings"] = "Kontoeinstellungen";
-$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
-$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren";
-$a->strings["Admin"] = "Administration";
-$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
-$a->strings["Navigation"] = "Navigation";
-$a->strings["Site map"] = "Sitemap";
-$a->strings["Embedded content"] = "Eingebetteter Inhalt";
-$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
-$a->strings["Contact Photos"] = "Kontaktbilder";
-$a->strings["Welcome "] = "Willkommen ";
-$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
-$a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
+$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["newer"] = "neuer";
 $a->strings["older"] = "älter";
 $a->strings["prev"] = "vorige";
@@ -714,11 +697,30 @@ $a->strings["comment"] = array(
 );
 $a->strings["post"] = "Beitrag";
 $a->strings["Item filed"] = "Beitrag abgelegt";
-$a->strings["stopped following"] = "wird nicht mehr gefolgt";
-$a->strings["Drop Contact"] = "Kontakt löschen";
-$a->strings["Organisation"] = "Organisation";
-$a->strings["News"] = "Nachrichten";
-$a->strings["Forum"] = "Forum";
+$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
+$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
+$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
+$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
+$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
+$a->strings["Name too short."] = "Der Name ist zu kurz.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
+$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
+$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen.";
+$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
+$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["default"] = "Standard";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden.";
+$a->strings["Registration at %s"] = "Registrierung als %s";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
+$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
+$a->strings["Registration details for %s"] = "Details der Registration von %s";
 $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["Access denied."] = "Zugriff verweigert.";
 $a->strings["Welcome to %s"] = "Willkommen zu %s";
@@ -763,10 +765,6 @@ $a->strings["No profile"] = "Kein Profil";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["Invalid request."] = "Ungültige Anfrage";
-$a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
-$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
-$a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
@@ -820,10 +818,6 @@ $a->strings["Tag removed"] = "Tag entfernt";
 $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
 $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
 $a->strings["Remove"] = "Entfernen";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt.";
-$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
-$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
-$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements";
 $a->strings["Error"] = "Fehler";
 $a->strings["Done"] = "Erledigt";
@@ -1098,6 +1092,8 @@ $a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, ab
 $a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
 $a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
+$a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
+$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
 $a->strings["Upload File:"] = "Datei hochladen:";
 $a->strings["Select a profile:"] = "Profil auswählen:";
 $a->strings["Upload"] = "Hochladen";
@@ -1108,6 +1104,7 @@ $a->strings["Crop Image"] = "Bild zurechtschneiden";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
 $a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
 $a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
+$a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Account approved."] = "Konto freigegeben.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
 $a->strings["Please login."] = "Bitte melde Dich an.";
@@ -1211,6 +1208,207 @@ $a->strings["Work/employment"] = "Arbeit/Anstellung";
 $a->strings["School/education"] = "Schule/Ausbildung";
 $a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
 $a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
+$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
+$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
+$a->strings["View"] = "Ansehen";
+$a->strings["Previous"] = "Vorherige";
+$a->strings["Next"] = "Nächste";
+$a->strings["list"] = "Liste";
+$a->strings["User not found"] = "Nutzer nicht gefunden";
+$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt.";
+$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden";
+$a->strings["calendar"] = "Kalender";
+$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
+$a->strings["Common Friends"] = "Gemeinsame Kontakte";
+$a->strings["Not available."] = "Nicht verfügbar.";
+$a->strings["%d contact edited."] = array(
+	0 => "%d Kontakt bearbeitet.",
+	1 => "%d Kontakte bearbeitet.",
+);
+$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
+$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
+$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
+$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
+$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
+$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
+$a->strings["Drop contact"] = "Kontakt löschen";
+$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
+$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
+$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
+$a->strings["You are sharing with %s"] = "Du teilst mit %s";
+$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
+$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
+$a->strings["Never"] = "Niemals";
+$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
+$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
+$a->strings["Suggest friends"] = "Kontakte vorschlagen";
+$a->strings["Network type: %s"] = "Netzwerktyp: %s";
+$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
+$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
+$a->strings["Disabled"] = "Deaktiviert";
+$a->strings["Fetch information"] = "Beziehe Information";
+$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
+$a->strings["Contact"] = "Kontakt: ";
+$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
+$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
+$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
+$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Last update:"] = "Letzte Aktualisierung: ";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Unblock"] = "Entsperren";
+$a->strings["Block"] = "Sperren";
+$a->strings["Unignore"] = "Ignorieren aufheben";
+$a->strings["Currently blocked"] = "Derzeit geblockt";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Momentan archiviert";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
+$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
+$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
+$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
+$a->strings["Actions"] = "Aktionen";
+$a->strings["Contact Settings"] = "Kontakteinstellungen";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
+$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
+$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Unblocked"] = "Ungeblockt";
+$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
+$a->strings["Blocked"] = "Geblockt";
+$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
+$a->strings["Ignored"] = "Ignoriert";
+$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
+$a->strings["Archived"] = "Archiviert";
+$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
+$a->strings["Hidden"] = "Verborgen";
+$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
+$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
+$a->strings["Update"] = "Aktualisierungen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Batch Actions"] = "Stapelverarbeitung";
+$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
+$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
+$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
+$a->strings["is a fan of yours"] = "ist ein Fan von dir";
+$a->strings["you are a fan of"] = "Du bist Fan von";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
+$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
+$a->strings["Delete contact"] = "Lösche den Kontakt";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Results for:"] = "Ergebnisse für:";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
+$a->strings["People Search - %s"] = "Personensuche - %s";
+$a->strings["Forum Search - %s"] = "Forensuche - %s";
+$a->strings["No matches"] = "Keine Übereinstimmungen";
+$a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
+$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt.";
+$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
+$a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
+$a->strings["Event details"] = "Veranstaltungsdetails";
+$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt";
+$a->strings["Event Starts:"] = "Veranstaltungsbeginn:";
+$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant";
+$a->strings["Event Finishes:"] = "Veranstaltungsende:";
+$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen";
+$a->strings["Description:"] = "Beschreibung";
+$a->strings["Title:"] = "Titel:";
+$a->strings["Share this event"] = "Veranstaltung teilen";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
+$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
+$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
+$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
+$a->strings["System check"] = "Systemtest";
+$a->strings["Check again"] = "Noch einmal testen";
+$a->strings["Database connection"] = "Datenbankverbindung";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
+$a->strings["Database Server Name"] = "Datenbank-Server";
+$a->strings["Database Login Name"] = "Datenbank-Nutzer";
+$a->strings["Database Login Password"] = "Datenbank-Passwort";
+$a->strings["Database Name"] = "Datenbank-Name";
+$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
+$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
+$a->strings["Site settings"] = "Server-Einstellungen";
+$a->strings["System Language:"] = "Systemsprache:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
+$a->strings["PHP executable path"] = "Pfad zu PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
+$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
+$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
+$a->strings["PHP cli binary"] = "PHP CLI Binary";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
+$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
+$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
+$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
+$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
+$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
+$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
+$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul";
+$a->strings["XML PHP module"] = "XML PHP Modul";
+$a->strings["iconv module"] = "iconv module";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert";
+$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
+$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. ";
+$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren.";
+$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function";
+$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
+$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
+$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen.";
+$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
+$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu.";
+$a->strings["is interested in:"] = "ist interessiert an:";
+$a->strings["Profile Match"] = "Profilübereinstimmungen";
+$a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
+$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
+$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
 $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
@@ -1227,6 +1425,7 @@ $a->strings["check webfinger"] = "Webfinger überprüfen";
 $a->strings["Plugin Features"] = "Plugin Features";
 $a->strings["diagnostics"] = "Diagnose";
 $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
+$a->strings["unknown"] = "Unbekannt";
 $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt.";
 $a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern.";
 $a->strings["Administration"] = "Administration";
@@ -1237,6 +1436,8 @@ $a->strings["Recipient Profile"] = "Empfänger Profil";
 $a->strings["Created"] = "Erstellt";
 $a->strings["Last Tried"] = "Zuletzt versucht";
 $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden.";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the <tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"] = "Deine DB enthält einige Tabellen die noch auf MyISAM laufen. Du solltest den Engine-Type auf InnoDB umstellen, da Friendica in Zukunft einige InnoDB Features nutzen wird. Eine Anleitung zur Umstellung kannst du <a href=\"%s\">hier</a> finden. Außerdem kannst du das <tt>convert_innodb.sql</tt> Skript verwenden, das du im <tt>/util</tt> Verzeichnis deiner Friendica Installation findest.";
+$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Du verwendets eine MySQL Version die nicht alle Features unterstützt die Friendica verwendet. Wir empfehlen dir einen Wechsel auf MariaDB, falls dies möglich ist.";
 $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Soapbox Account"] = "Marktschreier-Konto";
 $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
@@ -1256,9 +1457,7 @@ $a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für
 $a->strings["No community page"] = "Keine Gemeinschaftsseite";
 $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von Nutzer_innen dieser Seite";
 $a->strings["Global community page"] = "Globale Gemeinschaftsseite";
-$a->strings["Never"] = "Niemals";
 $a->strings["At post arrival"] = "Beim Empfang von Nachrichten";
-$a->strings["Disabled"] = "Deaktiviert";
 $a->strings["Users, Global Contacts"] = "Nutzer, globale Kontakte";
 $a->strings["Users, Global Contacts/fallback"] = "Nutzer, globale Kontakte / Fallback";
 $a->strings["One month"] = "ein Monat";
@@ -1469,9 +1668,8 @@ $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf
 $a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanente Löschung";
 $a->strings["Request date"] = "Anfragedatum";
 $a->strings["No registrations."] = "Keine Neuanmeldungen.";
+$a->strings["Note from the user"] = "Hinweis vom Nutzer";
 $a->strings["Deny"] = "Verwehren";
-$a->strings["Block"] = "Sperren";
-$a->strings["Unblock"] = "Entsperren";
 $a->strings["Site admin"] = "Seitenadministrator";
 $a->strings["Account expired"] = "Account ist abgelaufen";
 $a->strings["New User"] = "Neuer Nutzer";
@@ -1511,194 +1709,6 @@ $a->strings["Off"] = "Aus";
 $a->strings["On"] = "An";
 $a->strings["Lock feature %s"] = "Feature festlegen: %s";
 $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten";
-$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
-$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
-$a->strings["View"] = "Ansehen";
-$a->strings["Previous"] = "Vorherige";
-$a->strings["Next"] = "Nächste";
-$a->strings["list"] = "Liste";
-$a->strings["User not found"] = "Nutzer nicht gefunden";
-$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt.";
-$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden";
-$a->strings["calendar"] = "Kalender";
-$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
-$a->strings["Common Friends"] = "Gemeinsame Kontakte";
-$a->strings["Not available."] = "Nicht verfügbar.";
-$a->strings["%d contact edited."] = array(
-	0 => "%d Kontakt bearbeitet.",
-	1 => "%d Kontakte bearbeitet.",
-);
-$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
-$a->strings["Contact updated."] = "Kontakt aktualisiert.";
-$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
-$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
-$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
-$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
-$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
-$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
-$a->strings["Drop contact"] = "Kontakt löschen";
-$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
-$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
-$a->strings["You are sharing with %s"] = "Du teilst mit %s";
-$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
-$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
-$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
-$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
-$a->strings["Suggest friends"] = "Kontakte vorschlagen";
-$a->strings["Network type: %s"] = "Netzwerktyp: %s";
-$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
-$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
-$a->strings["Fetch information"] = "Beziehe Information";
-$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
-$a->strings["Contact"] = "Kontakt: ";
-$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
-$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
-$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
-$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
-$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
-$a->strings["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Last update:"] = "Letzte Aktualisierung: ";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
-$a->strings["Unignore"] = "Ignorieren aufheben";
-$a->strings["Currently blocked"] = "Derzeit geblockt";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Momentan archiviert";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
-$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
-$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
-$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
-$a->strings["Actions"] = "Aktionen";
-$a->strings["Contact Settings"] = "Kontakteinstellungen";
-$a->strings["Suggestions"] = "Kontaktvorschläge";
-$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
-$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblocked"] = "Ungeblockt";
-$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
-$a->strings["Blocked"] = "Geblockt";
-$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
-$a->strings["Ignored"] = "Ignoriert";
-$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
-$a->strings["Archived"] = "Archiviert";
-$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
-$a->strings["Hidden"] = "Verborgen";
-$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
-$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
-$a->strings["Update"] = "Aktualisierungen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Batch Actions"] = "Stapelverarbeitung";
-$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
-$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
-$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
-$a->strings["is a fan of yours"] = "ist ein Fan von dir";
-$a->strings["you are a fan of"] = "Du bist Fan von";
-$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
-$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
-$a->strings["Delete contact"] = "Lösche den Kontakt";
-$a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Find on this site"] = "Auf diesem Server suchen";
-$a->strings["Results for:"] = "Ergebnisse für:";
-$a->strings["Site Directory"] = "Verzeichnis";
-$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
-$a->strings["People Search - %s"] = "Personensuche - %s";
-$a->strings["Forum Search - %s"] = "Forensuche - %s";
-$a->strings["No matches"] = "Keine Übereinstimmungen";
-$a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
-$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt.";
-$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
-$a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
-$a->strings["Event details"] = "Veranstaltungsdetails";
-$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt";
-$a->strings["Event Starts:"] = "Veranstaltungsbeginn:";
-$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant";
-$a->strings["Event Finishes:"] = "Veranstaltungsende:";
-$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen";
-$a->strings["Description:"] = "Beschreibung";
-$a->strings["Title:"] = "Titel:";
-$a->strings["Share this event"] = "Veranstaltung teilen";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
-$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
-$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
-$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
-$a->strings["System check"] = "Systemtest";
-$a->strings["Check again"] = "Noch einmal testen";
-$a->strings["Database connection"] = "Datenbankverbindung";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
-$a->strings["Database Server Name"] = "Datenbank-Server";
-$a->strings["Database Login Name"] = "Datenbank-Nutzer";
-$a->strings["Database Login Password"] = "Datenbank-Passwort";
-$a->strings["Database Name"] = "Datenbank-Name";
-$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
-$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
-$a->strings["Site settings"] = "Server-Einstellungen";
-$a->strings["System Language:"] = "Systemsprache:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
-$a->strings["PHP executable path"] = "Pfad zu PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
-$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
-$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
-$a->strings["PHP cli binary"] = "PHP CLI Binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
-$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
-$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
-$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
-$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
-$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
-$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
-$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul";
-$a->strings["XML PHP module"] = "XML PHP Modul";
-$a->strings["iconv module"] = "iconv module";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert";
-$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
-$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. ";
-$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren.";
-$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function";
-$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
-$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
-$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
-$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen.";
-$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
 $a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
 $a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden.";
@@ -1706,15 +1716,11 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia
 $a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest.";
 $a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
-$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu.";
-$a->strings["is interested in:"] = "ist interessiert an:";
-$a->strings["Profile Match"] = "Profilübereinstimmungen";
-$a->strings["Warning: This group contains %s member from an insecure network."] = array(
-	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
-	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array(
+	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.",
+	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.",
 );
-$a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten.";
+$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden.";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen.";
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Commented Order"] = "Neueste Kommentare";
@@ -1777,7 +1783,6 @@ $a->strings["View Album"] = "Album betrachten";
 $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten";
 $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht";
 $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
-$a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
 $a->strings["Registration successful."] = "Registrierung erfolgreich.";
@@ -1787,6 +1792,8 @@ $a->strings["You may (optionally) fill in this form via OpenID by supplying your
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
 $a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
 $a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?";
+$a->strings["Note for the admin"] = "Hinweis für den Admin";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest.";
 $a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
 $a->strings["Your invitation ID: "] = "ID Deiner Einladung: ";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):";
@@ -1797,16 +1804,6 @@ $a->strings["Confirm:"] = "Bestätigen:";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
 $a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
 $a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
-$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
-$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
-$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
-$a->strings["Delete Video"] = "Video Löschen";
-$a->strings["No videos selected"] = "Keine Videos  ausgewählt";
-$a->strings["Recent Videos"] = "Neueste Videos";
-$a->strings["Upload New Videos"] = "Neues Video hochladen";
-$a->strings["No contacts."] = "Keine Kontakte.";
 $a->strings["Display"] = "Anzeige";
 $a->strings["Social Networks"] = "Soziale Netzwerke";
 $a->strings["Connected apps"] = "Verbundene Programme";
@@ -1872,6 +1869,8 @@ $a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
 $a->strings["Display Settings"] = "Anzeige-Einstellungen";
 $a->strings["Display Theme:"] = "Theme:";
 $a->strings["Mobile Theme:"] = "Mobiles Theme";
+$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können.";
 $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
 $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekeunden. Gib -1 ein um abzuschalten.";
 $a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
@@ -1976,6 +1975,17 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ve
 $a->strings["Relocate"] = "Umziehen";
 $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
 $a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
+$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
+$a->strings["Delete Video"] = "Video Löschen";
+$a->strings["No videos selected"] = "Keine Videos  ausgewählt";
+$a->strings["Recent Videos"] = "Neueste Videos";
+$a->strings["Upload New Videos"] = "Neues Video hochladen";
+$a->strings["No contacts."] = "Keine Kontakte.";
+$a->strings["Invalid request."] = "Ungültige Anfrage";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt.";
+$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
+$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
+$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["via"] = "via";
 $a->strings["Repeat the image"] = "Bild wiederholen";
 $a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen.";
@@ -1997,17 +2007,12 @@ $a->strings["Content background transparency"] = "Transparanz des Hintergrunds v
 $a->strings["Set the background image"] = "Hintergrundbild festlegen";
 $a->strings["Guest"] = "Gast";
 $a->strings["Visitor"] = "Besucher";
-$a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)";
-$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
-$a->strings["Set theme width"] = "Theme Breite festlegen";
-$a->strings["Color scheme"] = "Farbschema";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
+$a->strings["Color scheme"] = "Farbschema";
 $a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
 $a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
-$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
-$a->strings["Set colour scheme"] = "Farbschema wählen";
 $a->strings["Community Profiles"] = "Community-Profile";
 $a->strings["Last users"] = "Letzte Nutzer";
 $a->strings["Find Friends"] = "Kontakte finden";
@@ -2018,18 +2023,6 @@ $a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste d
 $a->strings["Set style"] = "Stil auswählen";
 $a->strings["Community Pages"] = "Foren";
 $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
-$a->strings["Your contacts"] = "Deine Kontakte";
-$a->strings["Your personal photos"] = "Deine privaten Fotos";
-$a->strings["Last likes"] = "Zuletzt gemocht";
-$a->strings["Last photos"] = "Letzte Fotos";
-$a->strings["Earth Layers"] = "Earth Layers";
-$a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer";
-$a->strings["Set longitude (X) for Earth Layers"] = "Longitude (X) der Earth Layer";
-$a->strings["Set latitude (Y) for Earth Layers"] = "Latitude (Y) der Earth Layer";
-$a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen";
-$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
-$a->strings["Set color scheme"] = "Wähle Farbschema";
-$a->strings["Set zoomfactor for Earth Layer"] = "Zoomfaktor der Earth Layer";
 $a->strings["greenzero"] = "greenzero";
 $a->strings["purplezero"] = "purplezero";
 $a->strings["easterbunny"] = "easterbunny";

view/lang/es/messages.po

@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-10 15:43+0100\n"
-"PO-Revision-Date: 2016-11-16 16:33+0000\n"
+"POT-Creation-Date: 2016-11-20 21:45+0100\n"
+"PO-Revision-Date: 2016-11-21 13:20+0000\n"
 "Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -78,8 +78,8 @@ msgstr "Buscar personas"
 msgid "Enter name or interest"
 msgstr "Introduzce nombre o intereses"
 
-#: include/contact_widgets.php:32 include/conversation.php:981
-#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66
+#: include/contact_widgets.php:32 include/Contact.php:375
+#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66
 #: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
 #: mod/suggest.php:83
 msgid "Connect/Follow"
@@ -94,12 +94,11 @@ msgid "Find"
 msgstr "Buscar"
 
 #: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:203 view/theme/diabook/theme.php:527
+#: view/theme/vier/theme.php:203
 msgid "Friend Suggestions"
 msgstr "Sugerencias de amigos"
 
 #: include/contact_widgets.php:36 view/theme/vier/theme.php:202
-#: view/theme/diabook/theme.php:526
 msgid "Similar Interests"
 msgstr "Intereses similares"
 
@@ -108,7 +107,6 @@ msgid "Random Profile"
 msgstr "Perfil aleatorio"
 
 #: include/contact_widgets.php:38 view/theme/vier/theme.php:204
-#: view/theme/diabook/theme.php:528
 msgid "Invite Friends"
 msgstr "Invitar amigos"
 
@@ -140,8 +138,8 @@ msgstr[0] "%d contacto en común"
 msgstr[1] "%d contactos en común"
 
 #: include/contact_widgets.php:242 include/ForumManager.php:119
-#: include/items.php:2188 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:970
+#: include/items.php:2223 mod/content.php:624 object/Item.php:432
+#: view/theme/vier/theme.php:260 boot.php:971
 msgid "show more"
 msgstr "ver más"
 
@@ -478,133 +476,6 @@ msgstr "Contactos sin grupo"
 msgid "add"
 msgstr "añadir"
 
-#: include/user.php:39 mod/settings.php:371
-msgid "Passwords do not match. Password unchanged."
-msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
-
-#: include/user.php:48
-msgid "An invitation is required."
-msgstr "Se necesita invitación."
-
-#: include/user.php:53
-msgid "Invitation could not be verified."
-msgstr "No se puede verificar la invitación."
-
-#: include/user.php:61
-msgid "Invalid OpenID url"
-msgstr "Dirección OpenID no válida"
-
-#: include/user.php:82
-msgid "Please enter the required information."
-msgstr "Por favor, introduce la información necesaria."
-
-#: include/user.php:96
-msgid "Please use a shorter name."
-msgstr "Por favor, usa un nombre más corto."
-
-#: include/user.php:98
-msgid "Name too short."
-msgstr "El nombre es demasiado corto."
-
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "No parece que ese sea tu nombre completo."
-
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio."
-
-#: include/user.php:121
-msgid "Not a valid email address."
-msgstr "No es una dirección de correo electrónico válida."
-
-#: include/user.php:134
-msgid "Cannot use that email."
-msgstr "No se puede utilizar este correo electrónico."
-
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
-msgstr "El apodo solo puede contener  \"a-z\", \"0-9\" y \"_\"."
-
-#: include/user.php:147 include/user.php:245
-msgid "Nickname is already registered. Please choose another."
-msgstr "Apodo ya registrado. Por favor, elije otro."
-
-#: include/user.php:157
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro."
-
-#: include/user.php:173
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
-
-#: include/user.php:231
-msgid "An error occurred during registration. Please try again."
-msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."
-
-#: include/user.php:256 view/theme/duepuntozero/config.php:44
-msgid "default"
-msgstr "predeterminado"
-
-#: include/user.php:266
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."
-
-#: include/user.php:345 include/user.php:352 include/user.php:359
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:210 mod/profile_photo.php:302
-#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
-#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
-#: mod/photos.php:1819 view/theme/diabook/theme.php:500
-msgid "Profile Photos"
-msgstr "Foto del perfil"
-
-#: include/user.php:387
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
-msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t"
-
-#: include/user.php:391
-#, php-format
-msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
-msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2$s."
-
-#: include/user.php:423 mod/admin.php:1184
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalles de registro para %s"
-
 #: include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr "Desconocido | No clasificado"
@@ -629,19 +500,19 @@ msgstr "OK, probablemente inofensivo"
 msgid "Reputable, has my trust"
 msgstr "Buena reputación, tiene mi confianza"
 
-#: include/contact_selectors.php:56 mod/admin.php:862
+#: include/contact_selectors.php:56 mod/admin.php:887
 msgid "Frequently"
 msgstr "Frequentemente"
 
-#: include/contact_selectors.php:57 mod/admin.php:863
+#: include/contact_selectors.php:57 mod/admin.php:888
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: include/contact_selectors.php:58 mod/admin.php:864
+#: include/contact_selectors.php:58 mod/admin.php:889
 msgid "Twice daily"
 msgstr "Dos veces al día"
 
-#: include/contact_selectors.php:59 mod/admin.php:865
+#: include/contact_selectors.php:59 mod/admin.php:890
 msgid "Daily"
 msgstr "Diariamente"
 
@@ -666,12 +537,12 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1367 mod/admin.php:1380 mod/admin.php:1392 mod/admin.php:1410
+#: mod/admin.php:1392 mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1436
 msgid "Email"
 msgstr "Correo electrónico"
 
 #: include/contact_selectors.php:80 mod/dfrn_request.php:869
-#: mod/settings.php:840
+#: mod/settings.php:842
 msgid "Diaspora"
 msgstr "Diaspora*"
 
@@ -723,10 +594,6 @@ msgstr "App.net"
 msgid "Hubzilla/Redmatrix"
 msgstr "Hubzilla/Redmatrix"
 
-#: include/network.php:595
-msgid "view full size"
-msgstr "Ver a tamaño completo"
-
 #: include/acl_selectors.php:327
 msgid "Post to Email"
 msgstr "Publicar mediante correo electrónico"
@@ -736,7 +603,7 @@ msgstr "Publicar mediante correo electrónico"
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr "Conectores deshabilitados, ya que \"%s\" es habilitado."
 
-#: include/acl_selectors.php:333 mod/settings.php:1176
+#: include/acl_selectors.php:333 mod/settings.php:1181
 msgid "Hide your profile details from unknown viewers?"
 msgstr "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?"
 
@@ -745,12 +612,10 @@ msgid "Visible to everybody"
 msgstr "Visible para cualquiera"
 
 #: include/acl_selectors.php:339 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "show"
 msgstr "mostrar"
 
 #: include/acl_selectors.php:340 view/theme/vier/config.php:103
-#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142
 msgid "don't show"
 msgstr "no mostrar"
 
@@ -773,25 +638,23 @@ msgstr "Cerrado"
 
 #: include/like.php:163 include/conversation.php:130
 #: include/conversation.php:266 include/text.php:1808 mod/subthread.php:87
-#: mod/tagger.php:62 view/theme/diabook/theme.php:471
+#: mod/tagger.php:62
 msgid "photo"
 msgstr "foto"
 
-#: include/like.php:163 include/diaspora.php:1402 include/conversation.php:125
+#: include/like.php:163 include/conversation.php:125
 #: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62
-#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475
+#: include/conversation.php:270 include/diaspora.php:1406 mod/subthread.php:87
+#: mod/tagger.php:62
 msgid "status"
 msgstr "estado"
 
 #: include/like.php:165 include/conversation.php:122
 #: include/conversation.php:258 include/text.php:1806
-#: view/theme/diabook/theme.php:463
 msgid "event"
 msgstr "evento"
 
-#: include/like.php:182 include/diaspora.php:1398 include/conversation.php:141
-#: view/theme/diabook/theme.php:480
+#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1402
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
@@ -820,9 +683,9 @@ msgstr "%1$s puede que atienda %2$s's %3$s"
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: include/message.php:145 include/Photo.php:1045 include/Photo.php:1061
-#: include/Photo.php:1069 include/Photo.php:1094 mod/wall_upload.php:218
-#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:477
+#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056
+#: include/Photo.php:1064 include/Photo.php:1089 mod/item.php:477
+#: mod/wall_upload.php:218 mod/wall_upload.php:232 mod/wall_upload.php:239
 msgid "Wall Photos"
 msgstr "Foto del Muro"
 
@@ -874,89 +737,6 @@ msgstr[1] "%d contactos no importado"
 msgid "Done. You can now login with your username and password"
 msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña."
 
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr "Sistema"
-
-#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:402
-#: view/theme/frio/theme.php:253
-msgid "Network"
-msgstr "Red"
-
-#: include/NotificationsManager.php:167 mod/profiles.php:703
-#: mod/network.php:845
-msgid "Personal"
-msgstr "Personal"
-
-#: include/NotificationsManager.php:174 include/nav.php:105
-#: include/nav.php:161 view/theme/diabook/theme.php:123
-msgid "Home"
-msgstr "Inicio"
-
-#: include/NotificationsManager.php:181 include/nav.php:166
-msgid "Introductions"
-msgstr "Presentaciones"
-
-#: include/NotificationsManager.php:234 include/NotificationsManager.php:245
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s comentó la publicación de %s"
-
-#: include/NotificationsManager.php:244
-#, php-format
-msgid "%s created a new post"
-msgstr "%s creó una nueva publicación"
-
-#: include/NotificationsManager.php:258
-#, php-format
-msgid "%s liked %s's post"
-msgstr "A %s le gusta la publicación de %s"
-
-#: include/NotificationsManager.php:269
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "A %s no le gusta la publicación de %s"
-
-#: include/NotificationsManager.php:280
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s está asistiendo al evento %s's"
-
-#: include/NotificationsManager.php:291
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s no está asistiendo al evento %s's"
-
-#: include/NotificationsManager.php:302
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s podría asistir al evento %s's"
-
-#: include/NotificationsManager.php:317
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s es ahora es amigo de %s"
-
-#: include/NotificationsManager.php:750
-msgid "Friend Suggestion"
-msgstr "Propuestas de amistad"
-
-#: include/NotificationsManager.php:783
-msgid "Friend/Connect Request"
-msgstr "Solicitud de Amistad/Conexión"
-
-#: include/NotificationsManager.php:783
-msgid "New Follower"
-msgstr "Nuevo seguidor"
-
-#: include/diaspora.php:1954
-msgid "Sharing notification from Diaspora network"
-msgstr "Compartir notificaciones con la red Diaspora*"
-
-#: include/diaspora.php:2854
-msgid "Attachments:"
-msgstr "Archivos adjuntos:"
-
 #: include/features.php:63
 msgid "General Features"
 msgstr "Opciones generales"
@@ -1160,29 +940,6 @@ msgstr "Ajustes avanzados del perfil"
 msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles."
 
-#: include/delivery.php:439
-msgid "(no subject)"
-msgstr "(sin asunto)"
-
-#: include/delivery.php:450 include/enotify.php:43
-msgid "noreply"
-msgstr "no responder"
-
-#: include/api.php:1019
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
-msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."
-
-#: include/api.php:1039
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."
-
-#: include/api.php:1060
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
-msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."
-
 #: include/bbcode.php:348 include/bbcode.php:1055 include/bbcode.php:1056
 msgid "Image/photo"
 msgstr "Imagen/Foto"
@@ -1200,419 +957,6 @@ msgstr "$1 escribió:"
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
-#: include/conversation.php:147
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s atenderá %2$s's %3$s"
-
-#: include/conversation.php:150
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s no atenderá %2$s's %3$s"
-
-#: include/conversation.php:153
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s atenderá quizás %2$s's %3$s"
-
-#: include/conversation.php:185 mod/dfrn_confirm.php:473
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s ahora es amigo de %2$s"
-
-#: include/conversation.php:219
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s le dio un toque a %2$s"
-
-#: include/conversation.php:239 mod/mood.php:62
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s está actualmente %2$s"
-
-#: include/conversation.php:278 mod/tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
-
-#: include/conversation.php:303
-msgid "post/item"
-msgstr "publicación/tema"
-
-#: include/conversation.php:304
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
-#: mod/photos.php:1607
-msgid "Likes"
-msgstr "Me gusta"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
-#: mod/photos.php:1607
-msgid "Dislikes"
-msgstr "No me gusta"
-
-#: include/conversation.php:586 include/conversation.php:1477
-#: mod/content.php:373 mod/photos.php:1608
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Atendiendo"
-msgstr[1] "Atendiendo"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Not attending"
-msgstr "No atendiendo"
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Might attend"
-msgstr "Puede que atienda"
-
-#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
-#: mod/photos.php:1681 object/Item.php:133
-msgid "Select"
-msgstr "Seleccionar"
-
-#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/admin.php:1384 mod/contacts.php:808
-#: mod/contacts.php:1016 mod/photos.php:1682 mod/settings.php:739
-#: object/Item.php:134
-msgid "Delete"
-msgstr "Eliminar"
-
-#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
-#: mod/content.php:911 object/Item.php:367 object/Item.php:368
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver perfil de %s @ %s"
-
-#: include/conversation.php:765 object/Item.php:355
-msgid "Categories:"
-msgstr "Categorías:"
-
-#: include/conversation.php:766 object/Item.php:356
-msgid "Filed under:"
-msgstr "Archivado en:"
-
-#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
-#: object/Item.php:381
-#, php-format
-msgid "%s from %s"
-msgstr "%s de %s"
-
-#: include/conversation.php:789 mod/content.php:513
-msgid "View in context"
-msgstr "Verlo en contexto"
-
-#: include/conversation.php:791 include/conversation.php:1261
-#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
-#: mod/message.php:548 mod/content.php:515 mod/content.php:948
-#: mod/photos.php:1570 object/Item.php:406
-msgid "Please wait"
-msgstr "Por favor, espera"
-
-#: include/conversation.php:870
-msgid "remove"
-msgstr "eliminar"
-
-#: include/conversation.php:874
-msgid "Delete Selected Items"
-msgstr "Eliminar el elemento seleccionado"
-
-#: include/conversation.php:966
-msgid "Follow Thread"
-msgstr "Seguir publicacion"
-
-#: include/conversation.php:967 include/Contact.php:390
-msgid "View Status"
-msgstr "Ver estado"
-
-#: include/conversation.php:968 include/conversation.php:984
-#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr "Ver perfil"
-
-#: include/conversation.php:969 include/Contact.php:392
-msgid "View Photos"
-msgstr "Ver fotos"
-
-#: include/conversation.php:970 include/Contact.php:393
-msgid "Network Posts"
-msgstr "Publicaciones en la red"
-
-#: include/conversation.php:971 include/Contact.php:394
-msgid "View Contact"
-msgstr "Ver contacto"
-
-#: include/conversation.php:972 include/Contact.php:396
-msgid "Send PM"
-msgstr "Enviar mensaje privado"
-
-#: include/conversation.php:976 include/Contact.php:397
-msgid "Poke"
-msgstr "Toque"
-
-#: include/conversation.php:1094
-#, php-format
-msgid "%s likes this."
-msgstr "A %s le gusta esto."
-
-#: include/conversation.php:1097
-#, php-format
-msgid "%s doesn't like this."
-msgstr "A %s no le gusta esto."
-
-#: include/conversation.php:1100
-#, php-format
-msgid "%s attends."
-msgstr "%s atiende."
-
-#: include/conversation.php:1103
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s no atenderá."
-
-#: include/conversation.php:1106
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s quizás atenderá"
-
-#: include/conversation.php:1116
-msgid "and"
-msgstr "y"
-
-#: include/conversation.php:1122
-#, php-format
-msgid ", and %d other people"
-msgstr " y a otras %d personas"
-
-#: include/conversation.php:1131
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d personas</span> les gusta esto"
-
-#: include/conversation.php:1132
-#, php-format
-msgid "%s like this."
-msgstr "A %s le gusta esto."
-
-#: include/conversation.php:1135
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d personas</span> no les gusta esto"
-
-#: include/conversation.php:1136
-#, php-format
-msgid "%s don't like this."
-msgstr "A %s no le gusta esto."
-
-#: include/conversation.php:1139
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span  %1$s>%2$d personas</span> atienden"
-
-#: include/conversation.php:1140
-#, php-format
-msgid "%s attend."
-msgstr "%s atiende."
-
-#: include/conversation.php:1143
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span  %1$s>%2$d personas</span>no atienden"
-
-#: include/conversation.php:1144
-#, php-format
-msgid "%s don't attend."
-msgstr "%s no atiende."
-
-#: include/conversation.php:1147
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span  %1$s>%2$d people</span> quizá asistan"
-
-#: include/conversation.php:1148
-#, php-format
-msgid "%s anttend maybe."
-msgstr "%s atiende quizás."
-
-#: include/conversation.php:1187 include/conversation.php:1205
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visible para <strong>cualquiera</strong>"
-
-#: include/conversation.php:1188 include/conversation.php:1206
-#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
-#: mod/message.php:299 mod/message.php:442 mod/message.php:450
-msgid "Please enter a link URL:"
-msgstr "Introduce la dirección del enlace:"
-
-#: include/conversation.php:1189 include/conversation.php:1207
-msgid "Please enter a video link/URL:"
-msgstr "Por favor, introduce la URL/enlace del vídeo:"
-
-#: include/conversation.php:1190 include/conversation.php:1208
-msgid "Please enter an audio link/URL:"
-msgstr "Por favor, introduce la URL/enlace del audio:"
-
-#: include/conversation.php:1191 include/conversation.php:1209
-msgid "Tag term:"
-msgstr "Etiquetar:"
-
-#: include/conversation.php:1192 include/conversation.php:1210
-#: mod/filer.php:30
-msgid "Save to Folder:"
-msgstr "Guardar en directorio:"
-
-#: include/conversation.php:1193 include/conversation.php:1211
-msgid "Where are you right now?"
-msgstr "¿Dónde estás ahora?"
-
-#: include/conversation.php:1194
-msgid "Delete item(s)?"
-msgstr "¿Borrar objeto(s)?"
-
-#: include/conversation.php:1242 mod/photos.php:1569
-msgid "Share"
-msgstr "Compartir"
-
-#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
-#: mod/message.php:354 mod/message.php:545
-msgid "Upload photo"
-msgstr "Subir foto"
-
-#: include/conversation.php:1244 mod/editpost.php:111
-msgid "upload photo"
-msgstr "subir imagen"
-
-#: include/conversation.php:1245 mod/editpost.php:112
-msgid "Attach file"
-msgstr "Adjuntar archivo"
-
-#: include/conversation.php:1246 mod/editpost.php:113
-msgid "attach file"
-msgstr "adjuntar archivo"
-
-#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
-#: mod/message.php:355 mod/message.php:546
-msgid "Insert web link"
-msgstr "Insertar enlace"
-
-#: include/conversation.php:1248 mod/editpost.php:115
-msgid "web link"
-msgstr "enlace web"
-
-#: include/conversation.php:1249 mod/editpost.php:116
-msgid "Insert video link"
-msgstr "Insertar enlace del vídeo"
-
-#: include/conversation.php:1250 mod/editpost.php:117
-msgid "video link"
-msgstr "enlace de video"
-
-#: include/conversation.php:1251 mod/editpost.php:118
-msgid "Insert audio link"
-msgstr "Insertar vínculo del audio"
-
-#: include/conversation.php:1252 mod/editpost.php:119
-msgid "audio link"
-msgstr "enlace de audio"
-
-#: include/conversation.php:1253 mod/editpost.php:120
-msgid "Set your location"
-msgstr "Configurar tu localización"
-
-#: include/conversation.php:1254 mod/editpost.php:121
-msgid "set location"
-msgstr "establecer tu ubicación"
-
-#: include/conversation.php:1255 mod/editpost.php:122
-msgid "Clear browser location"
-msgstr "Borrar la localización del navegador"
-
-#: include/conversation.php:1256 mod/editpost.php:123
-msgid "clear location"
-msgstr "limpiar la localización"
-
-#: include/conversation.php:1258 mod/editpost.php:137
-msgid "Set title"
-msgstr "Establecer el título"
-
-#: include/conversation.php:1260 mod/editpost.php:139
-msgid "Categories (comma-separated list)"
-msgstr "Categorías (lista separada por comas)"
-
-#: include/conversation.php:1262 mod/editpost.php:125
-msgid "Permission settings"
-msgstr "Configuración de permisos"
-
-#: include/conversation.php:1263 mod/editpost.php:154
-msgid "permissions"
-msgstr "permisos"
-
-#: include/conversation.php:1271 mod/editpost.php:134
-msgid "Public post"
-msgstr "Publicación pública"
-
-#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
-#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
-#: mod/photos.php:1725 object/Item.php:729
-msgid "Preview"
-msgstr "Vista previa"
-
-#: include/conversation.php:1280 include/items.php:1917 mod/fbrowser.php:101
-#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
-#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
-#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
-#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677
-#: mod/settings.php:703
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: include/conversation.php:1286
-msgid "Post to Groups"
-msgstr "Publicar hacia grupos"
-
-#: include/conversation.php:1287
-msgid "Post to Contacts"
-msgstr "Publicar hacia contactos"
-
-#: include/conversation.php:1288
-msgid "Private post"
-msgstr "Publicación privada"
-
-#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
-msgid "Message"
-msgstr "Mensaje"
-
-#: include/conversation.php:1294 mod/editpost.php:153
-msgid "Browser"
-msgstr "Navegador"
-
-#: include/conversation.php:1449
-msgid "View all"
-msgstr "Ver todos los contactos"
-
-#: include/conversation.php:1471
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Me gusta"
-msgstr[1] "Me gusta"
-
-#: include/conversation.php:1474
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "No me gusta"
-msgstr[1] "No me gusta"
-
-#: include/conversation.php:1480
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "No atendiendo"
-msgstr[1] "No atendiendo"
-
 #: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
 msgid "Miscellaneous"
 msgstr "Varios"
@@ -1711,36 +1055,6 @@ msgstr "Cumpleaños de %s"
 msgid "Happy Birthday %s"
 msgstr "Feliz cumpleaños %s"
 
-#: include/dbstructure.php:26
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."
-
-#: include/dbstructure.php:31
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "El mensaje de error es\n[pre]%s[/pre]"
-
-#: include/dbstructure.php:183
-msgid "Errors encountered creating database tables."
-msgstr "Se han encontrados errores creando las tablas de la base de datos."
-
-#: include/dbstructure.php:260
-msgid "Errors encountered performing database changes."
-msgstr "Errores encontrados al ejecutar cambios en la base de datos."
-
-#: include/dfrn.php:1107
-#, php-format
-msgid "%s\\'s birthday"
-msgstr "%s\\'s cumpleaños"
-
 #: include/enotify.php:24
 msgid "Friendica Notification"
 msgstr "Notificación de Friendica"
@@ -1759,6 +1073,10 @@ msgstr "%s Administrador"
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrador"
 
+#: include/enotify.php:43 include/delivery.php:457
+msgid "noreply"
+msgstr "no responder"
+
 #: include/enotify.php:70
 #, php-format
 msgid "%s <!item_type!>"
@@ -2062,11 +1380,11 @@ msgstr "Vie"
 msgid "Sat"
 msgstr "Sab"
 
-#: include/event.php:448 include/text.php:1130 mod/settings.php:968
+#: include/event.php:448 include/text.php:1130 mod/settings.php:972
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/event.php:449 include/text.php:1130 mod/settings.php:968
+#: include/event.php:449 include/text.php:1130 mod/settings.php:972
 msgid "Monday"
 msgstr "Lunes"
 
@@ -2277,6 +1595,874 @@ msgstr "No ha sido posible recibir la información del contacto."
 msgid "following"
 msgstr "siguiendo"
 
+#: include/nav.php:35 mod/navigation.php:19
+msgid "Nothing new here"
+msgstr "Nada nuevo por aquí"
+
+#: include/nav.php:39 mod/navigation.php:23
+msgid "Clear notifications"
+msgstr "Limpiar notificaciones"
+
+#: include/nav.php:40 include/text.php:1015
+msgid "@name, !forum, #tags, content"
+msgstr "@name, !forum, #tags, contenido"
+
+#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1787
+msgid "Logout"
+msgstr "Salir"
+
+#: include/nav.php:78 view/theme/frio/theme.php:243
+msgid "End this session"
+msgstr "Cerrar la sesión"
+
+#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637
+#: mod/contacts.php:833 view/theme/frio/theme.php:246
+msgid "Status"
+msgstr "Estado"
+
+#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
+msgid "Your posts and conversations"
+msgstr "Tus publicaciones y conversaciones"
+
+#: include/nav.php:82 include/identity.php:605 include/identity.php:691
+#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32
+#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
+msgid "Profile"
+msgstr "Perfil"
+
+#: include/nav.php:82 view/theme/frio/theme.php:247
+msgid "Your profile page"
+msgstr "Tu página de perfil"
+
+#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32
+#: view/theme/frio/theme.php:248
+msgid "Photos"
+msgstr "Fotografías"
+
+#: include/nav.php:83 view/theme/frio/theme.php:248
+msgid "Your photos"
+msgstr "Tus fotos"
+
+#: include/nav.php:84 include/identity.php:738 include/identity.php:741
+#: view/theme/frio/theme.php:249
+msgid "Videos"
+msgstr "Videos"
+
+#: include/nav.php:84 view/theme/frio/theme.php:249
+msgid "Your videos"
+msgstr "Tus videos"
+
+#: include/nav.php:85 include/nav.php:149 include/identity.php:750
+#: include/identity.php:761 mod/cal.php:275 mod/events.php:379
+#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
+msgid "Events"
+msgstr "Eventos"
+
+#: include/nav.php:85 view/theme/frio/theme.php:250
+msgid "Your events"
+msgstr "Tus eventos"
+
+#: include/nav.php:86
+msgid "Personal notes"
+msgstr "Notas personales"
+
+#: include/nav.php:86
+msgid "Your personal notes"
+msgstr "Tus notas personales"
+
+#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1788
+msgid "Login"
+msgstr "Acceder"
+
+#: include/nav.php:95
+msgid "Sign in"
+msgstr "Date de alta"
+
+#: include/nav.php:105 include/nav.php:161
+#: include/NotificationsManager.php:174
+msgid "Home"
+msgstr "Inicio"
+
+#: include/nav.php:105
+msgid "Home Page"
+msgstr "Página de inicio"
+
+#: include/nav.php:109 mod/register.php:289 boot.php:1763
+msgid "Register"
+msgstr "Registrarse"
+
+#: include/nav.php:109
+msgid "Create an account"
+msgstr "Crea una cuenta"
+
+#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
+msgid "Help"
+msgstr "Ayuda"
+
+#: include/nav.php:115
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
+
+#: include/nav.php:119
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: include/nav.php:119
+msgid "Addon applications, utilities, games"
+msgstr "Aplicaciones, utilidades, juegos"
+
+#: include/nav.php:123 include/text.php:1012 mod/search.php:149
+msgid "Search"
+msgstr "Buscar"
+
+#: include/nav.php:123
+msgid "Search site content"
+msgstr " Busca contenido en la página"
+
+#: include/nav.php:126 include/text.php:1020
+msgid "Full Text"
+msgstr "Texto completo"
+
+#: include/nav.php:127 include/text.php:1021
+msgid "Tags"
+msgstr "Tags"
+
+#: include/nav.php:128 include/nav.php:192 include/identity.php:783
+#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792
+#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
+msgid "Contacts"
+msgstr "Contactos"
+
+#: include/nav.php:143 include/nav.php:145 mod/community.php:36
+msgid "Community"
+msgstr "Comunidad"
+
+#: include/nav.php:143
+msgid "Conversations on this site"
+msgstr "Conversaciones en este sitio"
+
+#: include/nav.php:145
+msgid "Conversations on the network"
+msgstr "Conversaciones en la red"
+
+#: include/nav.php:149 include/identity.php:753 include/identity.php:764
+#: view/theme/frio/theme.php:254
+msgid "Events and Calendar"
+msgstr "Eventos y Calendario"
+
+#: include/nav.php:152
+msgid "Directory"
+msgstr "Directorio"
+
+#: include/nav.php:152
+msgid "People directory"
+msgstr "Directorio de usuarios"
+
+#: include/nav.php:154
+msgid "Information"
+msgstr "Información"
+
+#: include/nav.php:154
+msgid "Information about this friendica instance"
+msgstr "Información sobre esta instancia de friendica"
+
+#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411
+#: view/theme/frio/theme.php:253
+msgid "Network"
+msgstr "Red"
+
+#: include/nav.php:158 view/theme/frio/theme.php:253
+msgid "Conversations from your friends"
+msgstr "Conversaciones de tus amigos"
+
+#: include/nav.php:159
+msgid "Network Reset"
+msgstr "Reseteo de la red"
+
+#: include/nav.php:159
+msgid "Load Network page with no filters"
+msgstr "Cargar pagina de redes sin filtros"
+
+#: include/nav.php:166 include/NotificationsManager.php:181
+msgid "Introductions"
+msgstr "Presentaciones"
+
+#: include/nav.php:166
+msgid "Friend Requests"
+msgstr "Solicitudes de amistad"
+
+#: include/nav.php:169 mod/notifications.php:96
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: include/nav.php:170
+msgid "See all notifications"
+msgstr "Ver todas las notificaciones"
+
+#: include/nav.php:171 mod/settings.php:902
+msgid "Mark as seen"
+msgstr "Marcar como leído"
+
+#: include/nav.php:171
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas las notificaciones del sistema como leídas"
+
+#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
+msgid "Messages"
+msgstr "Mensajes"
+
+#: include/nav.php:175 view/theme/frio/theme.php:255
+msgid "Private mail"
+msgstr "Correo privado"
+
+#: include/nav.php:176
+msgid "Inbox"
+msgstr "Entrada"
+
+#: include/nav.php:177
+msgid "Outbox"
+msgstr "Enviados"
+
+#: include/nav.php:178 mod/message.php:16
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: include/nav.php:181
+msgid "Manage"
+msgstr "Administrar"
+
+#: include/nav.php:181
+msgid "Manage other pages"
+msgstr "Administrar otras páginas"
+
+#: include/nav.php:184 mod/settings.php:81
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#: include/nav.php:184 mod/delegate.php:130
+msgid "Delegate Page Management"
+msgstr "Delegar la administración de la página"
+
+#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1520
+#: mod/admin.php:1778 mod/settings.php:111 view/theme/frio/theme.php:256
+msgid "Settings"
+msgstr "Configuración"
+
+#: include/nav.php:186 view/theme/frio/theme.php:256
+msgid "Account settings"
+msgstr "Configuración de tu cuenta"
+
+#: include/nav.php:189 include/identity.php:282
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: include/nav.php:189
+msgid "Manage/Edit Profiles"
+msgstr "Manejar/editar Perfiles"
+
+#: include/nav.php:192 view/theme/frio/theme.php:257
+msgid "Manage/edit friends and contacts"
+msgstr "Administrar/editar amigos y contactos"
+
+#: include/nav.php:197 mod/admin.php:186
+msgid "Admin"
+msgstr "Admin"
+
+#: include/nav.php:197
+msgid "Site setup and configuration"
+msgstr "Opciones y configuración del sitio"
+
+#: include/nav.php:200
+msgid "Navigation"
+msgstr "Navegación"
+
+#: include/nav.php:200
+msgid "Site map"
+msgstr "Mapa del sitio"
+
+#: include/oembed.php:252
+msgid "Embedded content"
+msgstr "Contenido integrado"
+
+#: include/oembed.php:260
+msgid "Embedding disabled"
+msgstr "Contenido incrustrado desabilitado"
+
+#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
+#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
+#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
+msgid "Contact Photos"
+msgstr "Foto del contacto"
+
+#: include/security.php:22
+msgid "Welcome "
+msgstr "Bienvenido "
+
+#: include/security.php:23
+msgid "Please upload a profile photo."
+msgstr "Por favor sube una foto para tu perfil."
+
+#: include/security.php:26
+msgid "Welcome back "
+msgstr "Bienvenido de nuevo "
+
+#: include/security.php:373
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."
+
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr "dejó de seguir"
+
+#: include/Contact.php:361 include/Contact.php:374 include/Contact.php:419
+#: include/conversation.php:968 include/conversation.php:984
+#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
+#: mod/match.php:71 mod/suggest.php:82
+msgid "View Profile"
+msgstr "Ver perfil"
+
+#: include/Contact.php:418 include/conversation.php:967
+msgid "View Status"
+msgstr "Ver estado"
+
+#: include/Contact.php:420 include/conversation.php:969
+msgid "View Photos"
+msgstr "Ver fotos"
+
+#: include/Contact.php:421 include/conversation.php:970
+msgid "Network Posts"
+msgstr "Publicaciones en la red"
+
+#: include/Contact.php:422 include/conversation.php:971
+msgid "View Contact"
+msgstr "Ver contacto"
+
+#: include/Contact.php:423
+msgid "Drop Contact"
+msgstr "Eliminar contacto"
+
+#: include/Contact.php:424 include/conversation.php:972
+msgid "Send PM"
+msgstr "Enviar mensaje privado"
+
+#: include/Contact.php:425 include/conversation.php:976
+msgid "Poke"
+msgstr "Toque"
+
+#: include/Contact.php:798
+msgid "Organisation"
+msgstr "Organización"
+
+#: include/Contact.php:801
+msgid "News"
+msgstr "Noticias"
+
+#: include/Contact.php:804
+msgid "Forum"
+msgstr "Foro"
+
+#: include/NotificationsManager.php:153
+msgid "System"
+msgstr "Sistema"
+
+#: include/NotificationsManager.php:167 mod/profiles.php:703
+#: mod/network.php:846
+msgid "Personal"
+msgstr "Personal"
+
+#: include/NotificationsManager.php:234 include/NotificationsManager.php:244
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s comentó la publicación de %s"
+
+#: include/NotificationsManager.php:243
+#, php-format
+msgid "%s created a new post"
+msgstr "%s creó una nueva publicación"
+
+#: include/NotificationsManager.php:256
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s le gusta la publicación de %s"
+
+#: include/NotificationsManager.php:267
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no le gusta la publicación de %s"
+
+#: include/NotificationsManager.php:278
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s está asistiendo al evento %s's"
+
+#: include/NotificationsManager.php:289
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s no está asistiendo al evento %s's"
+
+#: include/NotificationsManager.php:300
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s podría asistir al evento %s's"
+
+#: include/NotificationsManager.php:315
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ahora es amigo de %s"
+
+#: include/NotificationsManager.php:748
+msgid "Friend Suggestion"
+msgstr "Propuestas de amistad"
+
+#: include/NotificationsManager.php:781
+msgid "Friend/Connect Request"
+msgstr "Solicitud de Amistad/Conexión"
+
+#: include/NotificationsManager.php:781
+msgid "New Follower"
+msgstr "Nuevo seguidor"
+
+#: include/api.php:1018
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
+msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."
+
+#: include/api.php:1038
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
+msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."
+
+#: include/api.php:1059
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
+msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."
+
+#: include/conversation.php:147
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s atenderá %2$s's %3$s"
+
+#: include/conversation.php:150
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s no atenderá %2$s's %3$s"
+
+#: include/conversation.php:153
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s atenderá quizás %2$s's %3$s"
+
+#: include/conversation.php:185 mod/dfrn_confirm.php:473
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s ahora es amigo de %2$s"
+
+#: include/conversation.php:219
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s le dio un toque a %2$s"
+
+#: include/conversation.php:239 mod/mood.php:62
+#, php-format
+msgid "%1$s is currently %2$s"
+msgstr "%1$s está actualmente %2$s"
+
+#: include/conversation.php:278 mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
+
+#: include/conversation.php:303
+msgid "post/item"
+msgstr "publicación/tema"
+
+#: include/conversation.php:304
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
+#: mod/photos.php:1607
+msgid "Likes"
+msgstr "Me gusta"
+
+#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
+#: mod/photos.php:1607
+msgid "Dislikes"
+msgstr "No me gusta"
+
+#: include/conversation.php:586 include/conversation.php:1477
+#: mod/content.php:373 mod/photos.php:1608
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Atendiendo"
+msgstr[1] "Atendiendo"
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Not attending"
+msgstr "No atendiendo"
+
+#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
+msgid "Might attend"
+msgstr "Puede que atienda"
+
+#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
+#: mod/photos.php:1681 object/Item.php:133
+msgid "Select"
+msgstr "Seleccionar"
+
+#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
+#: mod/content.php:759 mod/contacts.php:808 mod/contacts.php:1016
+#: mod/admin.php:1410 mod/photos.php:1682 mod/settings.php:741
+#: object/Item.php:134
+msgid "Delete"
+msgstr "Eliminar"
+
+#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
+#: mod/content.php:911 object/Item.php:367 object/Item.php:368
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Ver perfil de %s @ %s"
+
+#: include/conversation.php:765 object/Item.php:355
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: include/conversation.php:766 object/Item.php:356
+msgid "Filed under:"
+msgstr "Archivado en:"
+
+#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
+#: object/Item.php:381
+#, php-format
+msgid "%s from %s"
+msgstr "%s de %s"
+
+#: include/conversation.php:789 mod/content.php:513
+msgid "View in context"
+msgstr "Verlo en contexto"
+
+#: include/conversation.php:791 include/conversation.php:1261
+#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
+#: mod/message.php:548 mod/content.php:515 mod/content.php:948
+#: mod/photos.php:1570 object/Item.php:406
+msgid "Please wait"
+msgstr "Por favor, espera"
+
+#: include/conversation.php:870
+msgid "remove"
+msgstr "eliminar"
+
+#: include/conversation.php:874
+msgid "Delete Selected Items"
+msgstr "Eliminar el elemento seleccionado"
+
+#: include/conversation.php:966
+msgid "Follow Thread"
+msgstr "Seguir publicacion"
+
+#: include/conversation.php:1094
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
+
+#: include/conversation.php:1097
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
+
+#: include/conversation.php:1100
+#, php-format
+msgid "%s attends."
+msgstr "%s atiende."
+
+#: include/conversation.php:1103
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s no atenderá."
+
+#: include/conversation.php:1106
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s quizás atenderá"
+
+#: include/conversation.php:1116
+msgid "and"
+msgstr "y"
+
+#: include/conversation.php:1122
+#, php-format
+msgid ", and %d other people"
+msgstr " y a otras %d personas"
+
+#: include/conversation.php:1131
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d personas</span> les gusta esto"
+
+#: include/conversation.php:1132
+#, php-format
+msgid "%s like this."
+msgstr "A %s le gusta esto."
+
+#: include/conversation.php:1135
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d personas</span> no les gusta esto"
+
+#: include/conversation.php:1136
+#, php-format
+msgid "%s don't like this."
+msgstr "A %s no le gusta esto."
+
+#: include/conversation.php:1139
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span  %1$s>%2$d personas</span> atienden"
+
+#: include/conversation.php:1140
+#, php-format
+msgid "%s attend."
+msgstr "%s atiende."
+
+#: include/conversation.php:1143
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span  %1$s>%2$d personas</span>no atienden"
+
+#: include/conversation.php:1144
+#, php-format
+msgid "%s don't attend."
+msgstr "%s no atiende."
+
+#: include/conversation.php:1147
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span  %1$s>%2$d people</span> quizá asistan"
+
+#: include/conversation.php:1148
+#, php-format
+msgid "%s anttend maybe."
+msgstr "%s atiende quizás."
+
+#: include/conversation.php:1187 include/conversation.php:1205
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible para <strong>cualquiera</strong>"
+
+#: include/conversation.php:1188 include/conversation.php:1206
+#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
+#: mod/message.php:299 mod/message.php:442 mod/message.php:450
+msgid "Please enter a link URL:"
+msgstr "Introduce la dirección del enlace:"
+
+#: include/conversation.php:1189 include/conversation.php:1207
+msgid "Please enter a video link/URL:"
+msgstr "Por favor, introduce la URL/enlace del vídeo:"
+
+#: include/conversation.php:1190 include/conversation.php:1208
+msgid "Please enter an audio link/URL:"
+msgstr "Por favor, introduce la URL/enlace del audio:"
+
+#: include/conversation.php:1191 include/conversation.php:1209
+msgid "Tag term:"
+msgstr "Etiquetar:"
+
+#: include/conversation.php:1192 include/conversation.php:1210
+#: mod/filer.php:30
+msgid "Save to Folder:"
+msgstr "Guardar en directorio:"
+
+#: include/conversation.php:1193 include/conversation.php:1211
+msgid "Where are you right now?"
+msgstr "¿Dónde estás ahora?"
+
+#: include/conversation.php:1194
+msgid "Delete item(s)?"
+msgstr "¿Borrar objeto(s)?"
+
+#: include/conversation.php:1242 mod/photos.php:1569
+msgid "Share"
+msgstr "Compartir"
+
+#: include/conversation.php:1243 mod/editpost.php:110 mod/wallmessage.php:154
+#: mod/message.php:354 mod/message.php:545
+msgid "Upload photo"
+msgstr "Subir foto"
+
+#: include/conversation.php:1244 mod/editpost.php:111
+msgid "upload photo"
+msgstr "subir imagen"
+
+#: include/conversation.php:1245 mod/editpost.php:112
+msgid "Attach file"
+msgstr "Adjuntar archivo"
+
+#: include/conversation.php:1246 mod/editpost.php:113
+msgid "attach file"
+msgstr "adjuntar archivo"
+
+#: include/conversation.php:1247 mod/editpost.php:114 mod/wallmessage.php:155
+#: mod/message.php:355 mod/message.php:546
+msgid "Insert web link"
+msgstr "Insertar enlace"
+
+#: include/conversation.php:1248 mod/editpost.php:115
+msgid "web link"
+msgstr "enlace web"
+
+#: include/conversation.php:1249 mod/editpost.php:116
+msgid "Insert video link"
+msgstr "Insertar enlace del vídeo"
+
+#: include/conversation.php:1250 mod/editpost.php:117
+msgid "video link"
+msgstr "enlace de video"
+
+#: include/conversation.php:1251 mod/editpost.php:118
+msgid "Insert audio link"
+msgstr "Insertar vínculo del audio"
+
+#: include/conversation.php:1252 mod/editpost.php:119
+msgid "audio link"
+msgstr "enlace de audio"
+
+#: include/conversation.php:1253 mod/editpost.php:120
+msgid "Set your location"
+msgstr "Configurar tu localización"
+
+#: include/conversation.php:1254 mod/editpost.php:121
+msgid "set location"
+msgstr "establecer tu ubicación"
+
+#: include/conversation.php:1255 mod/editpost.php:122
+msgid "Clear browser location"
+msgstr "Borrar la localización del navegador"
+
+#: include/conversation.php:1256 mod/editpost.php:123
+msgid "clear location"
+msgstr "limpiar la localización"
+
+#: include/conversation.php:1258 mod/editpost.php:137
+msgid "Set title"
+msgstr "Establecer el título"
+
+#: include/conversation.php:1260 mod/editpost.php:139
+msgid "Categories (comma-separated list)"
+msgstr "Categorías (lista separada por comas)"
+
+#: include/conversation.php:1262 mod/editpost.php:125
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: include/conversation.php:1263 mod/editpost.php:154
+msgid "permissions"
+msgstr "permisos"
+
+#: include/conversation.php:1271 mod/editpost.php:134
+msgid "Public post"
+msgstr "Publicación pública"
+
+#: include/conversation.php:1276 mod/editpost.php:145 mod/content.php:737
+#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
+#: mod/photos.php:1725 object/Item.php:729
+msgid "Preview"
+msgstr "Vista previa"
+
+#: include/conversation.php:1280 include/items.php:1952 mod/fbrowser.php:101
+#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
+#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
+#: mod/contacts.php:445 mod/suggest.php:32 mod/photos.php:235
+#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705
+#: mod/videos.php:128
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: include/conversation.php:1286
+msgid "Post to Groups"
+msgstr "Publicar hacia grupos"
+
+#: include/conversation.php:1287
+msgid "Post to Contacts"
+msgstr "Publicar hacia contactos"
+
+#: include/conversation.php:1288
+msgid "Private post"
+msgstr "Publicación privada"
+
+#: include/conversation.php:1293 include/identity.php:256 mod/editpost.php:152
+msgid "Message"
+msgstr "Mensaje"
+
+#: include/conversation.php:1294 mod/editpost.php:153
+msgid "Browser"
+msgstr "Navegador"
+
+#: include/conversation.php:1449
+msgid "View all"
+msgstr "Ver todos los contactos"
+
+#: include/conversation.php:1471
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Me gusta"
+msgstr[1] "Me gusta"
+
+#: include/conversation.php:1474
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "No me gusta"
+msgstr[1] "No me gusta"
+
+#: include/conversation.php:1480
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "No atendiendo"
+msgstr[1] "No atendiendo"
+
+#: include/dbstructure.php:26
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
+"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
+msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."
+
+#: include/dbstructure.php:31
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "El mensaje de error es\n[pre]%s[/pre]"
+
+#: include/dbstructure.php:183
+msgid "Errors encountered creating database tables."
+msgstr "Se han encontrados errores creando las tablas de la base de datos."
+
+#: include/dbstructure.php:260
+msgid "Errors encountered performing database changes."
+msgstr "Errores encontrados al ejecutar cambios en la base de datos."
+
+#: include/delivery.php:446
+msgid "(no subject)"
+msgstr "(sin asunto)"
+
+#: include/dfrn.php:1107
+#, php-format
+msgid "%s\\'s birthday"
+msgstr "%s\\'s cumpleaños"
+
+#: include/diaspora.php:1958
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartir notificaciones con la red Diaspora*"
+
+#: include/diaspora.php:2864
+msgid "Attachments:"
+msgstr "Archivos adjuntos:"
+
 #: include/identity.php:42
 msgid "Requested account is not available."
 msgstr "La cuenta solicitada no está disponible."
@@ -2293,10 +2479,6 @@ msgstr "Editar perfil"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: include/identity.php:282 include/nav.php:189
-msgid "Profiles"
-msgstr "Perfiles"
-
 #: include/identity.php:282
 msgid "Manage/edit profiles"
 msgstr "Administrar/editar perfiles"
@@ -2379,14 +2561,7 @@ msgstr "Recordatorios de eventos"
 msgid "Events this week:"
 msgstr "Eventos de esta semana:"
 
-#: include/identity.php:605 include/identity.php:691 include/identity.php:722
-#: include/nav.php:82 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Profile"
-msgstr "Perfil"
-
-#: include/identity.php:614 mod/settings.php:1274
+#: include/identity.php:614 mod/settings.php:1279
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -2480,16 +2655,11 @@ msgstr "Foros:"
 msgid "Basic"
 msgstr "Basic"
 
-#: include/identity.php:693 mod/admin.php:931 mod/contacts.php:870
-#: mod/events.php:508
+#: include/identity.php:693 mod/contacts.php:870 mod/events.php:508
+#: mod/admin.php:956
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: include/identity.php:714 include/nav.php:81 mod/contacts.php:637
-#: mod/contacts.php:833 view/theme/frio/theme.php:246
-msgid "Status"
-msgstr "Estado"
-
 #: include/identity.php:717 mod/follow.php:143 mod/contacts.php:836
 msgid "Status Messages and Posts"
 msgstr "Mensajes de Estado y Publicaciones"
@@ -2498,32 +2668,10 @@ msgstr "Mensajes de Estado y Publicaciones"
 msgid "Profile Details"
 msgstr "Detalles del Perfil"
 
-#: include/identity.php:730 include/nav.php:83 mod/fbrowser.php:32
-#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126
-msgid "Photos"
-msgstr "Fotografías"
-
 #: include/identity.php:733 mod/photos.php:87
 msgid "Photo Albums"
 msgstr "Álbum de Fotos"
 
-#: include/identity.php:738 include/identity.php:741 include/nav.php:84
-#: view/theme/frio/theme.php:249
-msgid "Videos"
-msgstr "Videos"
-
-#: include/identity.php:750 include/identity.php:761 include/nav.php:85
-#: include/nav.php:149 mod/cal.php:275 mod/events.php:379
-#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
-#: view/theme/diabook/theme.php:127
-msgid "Events"
-msgstr "Eventos"
-
-#: include/identity.php:753 include/identity.php:764 include/nav.php:149
-#: view/theme/frio/theme.php:254
-msgid "Events and Calendar"
-msgstr "Eventos y Calendario"
-
 #: include/identity.php:772 mod/notes.php:46
 msgid "Personal Notes"
 msgstr "Notas personales"
@@ -2532,41 +2680,33 @@ msgstr "Notas personales"
 msgid "Only You Can See This"
 msgstr "Únicamente tú puedes ver esto"
 
-#: include/identity.php:783 include/identity.php:786 include/nav.php:128
-#: include/nav.php:192 include/text.php:1022 mod/contacts.php:792
-#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:257
-#: view/theme/diabook/theme.php:125
-msgid "Contacts"
-msgstr "Contactos"
-
-#: include/items.php:1518 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
+#: include/items.php:1553 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726
 msgid "[Name Withheld]"
 msgstr "[Nombre oculto]"
 
-#: include/items.php:1873 mod/viewsrc.php:15 mod/notice.php:15
-#: mod/admin.php:234 mod/admin.php:1441 mod/admin.php:1675 mod/display.php:103
-#: mod/display.php:279 mod/display.php:478
+#: include/items.php:1908 mod/viewsrc.php:15 mod/notice.php:15
+#: mod/display.php:103 mod/display.php:279 mod/display.php:478
+#: mod/admin.php:234 mod/admin.php:1467 mod/admin.php:1701
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: include/items.php:1912
+#: include/items.php:1947
 msgid "Do you really want to delete this item?"
 msgstr "¿Realmente quieres borrar este objeto?"
 
-#: include/items.php:1914 mod/follow.php:110 mod/api.php:105
+#: include/items.php:1949 mod/follow.php:110 mod/api.php:105
 #: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
 #: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
-#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158
-#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176
-#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193
-#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226
-#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229
+#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163
+#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
+#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
+#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
+#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
 msgid "Yes"
 msgstr "Sí"
 
-#: include/items.php:2077 mod/wall_upload.php:77 mod/wall_upload.php:80
-#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15
-#: mod/invite.php:101 mod/wall_attach.php:67 mod/wall_attach.php:70
+#: include/items.php:2112 mod/notes.php:22 mod/uimport.php:23
+#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101
 #: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33
 #: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/editpost.php:10
 #: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33
@@ -2579,284 +2719,22 @@ msgstr "Sí"
 #: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605
 #: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18
 #: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
-#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
-#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22
-#: mod/settings.php:128 mod/settings.php:663 index.php:397
+#: mod/events.php:190 mod/suggest.php:58 mod/item.php:198 mod/item.php:210
+#: mod/network.php:4 mod/photos.php:159 mod/photos.php:1072
+#: mod/register.php:42 mod/settings.php:22 mod/settings.php:128
+#: mod/settings.php:665 mod/viewcontacts.php:45 mod/wall_attach.php:67
+#: mod/wall_attach.php:70 mod/wall_upload.php:77 mod/wall_upload.php:80
+#: index.php:397
 msgid "Permission denied."
 msgstr "Permiso denegado."
 
-#: include/items.php:2182
+#: include/items.php:2217
 msgid "Archives"
 msgstr "Archivos"
 
-#: include/nav.php:35 mod/navigation.php:19
-msgid "Nothing new here"
-msgstr "Nada nuevo por aquí"
-
-#: include/nav.php:39 mod/navigation.php:23
-msgid "Clear notifications"
-msgstr "Limpiar notificaciones"
-
-#: include/nav.php:40 include/text.php:1015
-msgid "@name, !forum, #tags, content"
-msgstr "@name, !forum, #tags, contenido"
-
-#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1778
-msgid "Logout"
-msgstr "Salir"
-
-#: include/nav.php:78 view/theme/frio/theme.php:243
-msgid "End this session"
-msgstr "Cerrar la sesión"
-
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
-#: view/theme/diabook/theme.php:123
-msgid "Your posts and conversations"
-msgstr "Tus publicaciones y conversaciones"
-
-#: include/nav.php:82 view/theme/frio/theme.php:247
-#: view/theme/diabook/theme.php:124
-msgid "Your profile page"
-msgstr "Tu página de perfil"
-
-#: include/nav.php:83 view/theme/frio/theme.php:248
-#: view/theme/diabook/theme.php:126
-msgid "Your photos"
-msgstr "Tus fotos"
-
-#: include/nav.php:84 view/theme/frio/theme.php:249
-msgid "Your videos"
-msgstr "Tus videos"
-
-#: include/nav.php:85 view/theme/frio/theme.php:250
-#: view/theme/diabook/theme.php:127
-msgid "Your events"
-msgstr "Tus eventos"
-
-#: include/nav.php:86 view/theme/diabook/theme.php:128
-msgid "Personal notes"
-msgstr "Notas personales"
-
-#: include/nav.php:86
-msgid "Your personal notes"
-msgstr "Tus notas personales"
-
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1779
-msgid "Login"
-msgstr "Acceder"
-
-#: include/nav.php:95
-msgid "Sign in"
-msgstr "Date de alta"
-
-#: include/nav.php:105
-msgid "Home Page"
-msgstr "Página de inicio"
-
-#: include/nav.php:109 mod/register.php:280 boot.php:1754
-msgid "Register"
-msgstr "Registrarse"
-
-#: include/nav.php:109
-msgid "Create an account"
-msgstr "Crea una cuenta"
-
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
-msgid "Help"
-msgstr "Ayuda"
-
-#: include/nav.php:115
-msgid "Help and documentation"
-msgstr "Ayuda y documentación"
-
-#: include/nav.php:119
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: include/nav.php:119
-msgid "Addon applications, utilities, games"
-msgstr "Aplicaciones, utilidades, juegos"
-
-#: include/nav.php:123 include/text.php:1012 mod/search.php:149
-msgid "Search"
-msgstr "Buscar"
-
-#: include/nav.php:123
-msgid "Search site content"
-msgstr " Busca contenido en la página"
-
-#: include/nav.php:126 include/text.php:1020
-msgid "Full Text"
-msgstr "Texto completo"
-
-#: include/nav.php:127 include/text.php:1021
-msgid "Tags"
-msgstr "Tags"
-
-#: include/nav.php:143 include/nav.php:145 mod/community.php:36
-#: view/theme/diabook/theme.php:129
-msgid "Community"
-msgstr "Comunidad"
-
-#: include/nav.php:143
-msgid "Conversations on this site"
-msgstr "Conversaciones en este sitio"
-
-#: include/nav.php:145
-msgid "Conversations on the network"
-msgstr "Conversaciones en la red"
-
-#: include/nav.php:152
-msgid "Directory"
-msgstr "Directorio"
-
-#: include/nav.php:152
-msgid "People directory"
-msgstr "Directorio de usuarios"
-
-#: include/nav.php:154
-msgid "Information"
-msgstr "Información"
-
-#: include/nav.php:154
-msgid "Information about this friendica instance"
-msgstr "Información sobre esta instancia de friendica"
-
-#: include/nav.php:158 view/theme/frio/theme.php:253
-msgid "Conversations from your friends"
-msgstr "Conversaciones de tus amigos"
-
-#: include/nav.php:159
-msgid "Network Reset"
-msgstr "Reseteo de la red"
-
-#: include/nav.php:159
-msgid "Load Network page with no filters"
-msgstr "Cargar pagina de redes sin filtros"
-
-#: include/nav.php:166
-msgid "Friend Requests"
-msgstr "Solicitudes de amistad"
-
-#: include/nav.php:169 mod/notifications.php:96
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: include/nav.php:170
-msgid "See all notifications"
-msgstr "Ver todas las notificaciones"
-
-#: include/nav.php:171 mod/settings.php:900
-msgid "Mark as seen"
-msgstr "Marcar como leído"
-
-#: include/nav.php:171
-msgid "Mark all system notifications seen"
-msgstr "Marcar todas las notificaciones del sistema como leídas"
-
-#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:255
-msgid "Messages"
-msgstr "Mensajes"
-
-#: include/nav.php:175 view/theme/frio/theme.php:255
-msgid "Private mail"
-msgstr "Correo privado"
-
-#: include/nav.php:176
-msgid "Inbox"
-msgstr "Entrada"
-
-#: include/nav.php:177
-msgid "Outbox"
-msgstr "Enviados"
-
-#: include/nav.php:178 mod/message.php:16
-msgid "New Message"
-msgstr "Nuevo mensaje"
-
-#: include/nav.php:181
-msgid "Manage"
-msgstr "Administrar"
-
-#: include/nav.php:181
-msgid "Manage other pages"
-msgstr "Administrar otras páginas"
-
-#: include/nav.php:184 mod/settings.php:81
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: include/nav.php:184 mod/delegate.php:130
-msgid "Delegate Page Management"
-msgstr "Delegar la administración de la página"
-
-#: include/nav.php:186 mod/newmember.php:22 mod/admin.php:1494
-#: mod/admin.php:1752 mod/settings.php:111 view/theme/frio/theme.php:256
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648
-msgid "Settings"
-msgstr "Configuración"
-
-#: include/nav.php:186 view/theme/frio/theme.php:256
-msgid "Account settings"
-msgstr "Configuración de tu cuenta"
-
-#: include/nav.php:189
-msgid "Manage/Edit Profiles"
-msgstr "Manejar/editar Perfiles"
-
-#: include/nav.php:192 view/theme/frio/theme.php:257
-msgid "Manage/edit friends and contacts"
-msgstr "Administrar/editar amigos y contactos"
-
-#: include/nav.php:197 mod/admin.php:186
-msgid "Admin"
-msgstr "Admin"
-
-#: include/nav.php:197
-msgid "Site setup and configuration"
-msgstr "Opciones y configuración del sitio"
-
-#: include/nav.php:200
-msgid "Navigation"
-msgstr "Navegación"
-
-#: include/nav.php:200
-msgid "Site map"
-msgstr "Mapa del sitio"
-
-#: include/oembed.php:252
-msgid "Embedded content"
-msgstr "Contenido integrado"
-
-#: include/oembed.php:260
-msgid "Embedding disabled"
-msgstr "Contenido incrustrado desabilitado"
-
-#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
-#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
-#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
-#: view/theme/diabook/theme.php:499
-msgid "Contact Photos"
-msgstr "Foto del contacto"
-
-#: include/security.php:22
-msgid "Welcome "
-msgstr "Bienvenido "
-
-#: include/security.php:23
-msgid "Please upload a profile photo."
-msgstr "Por favor sube una foto para tu perfil."
-
-#: include/security.php:26
-msgid "Welcome back "
-msgstr "Bienvenido de nuevo "
-
-#: include/security.php:373
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."
+#: include/network.php:595
+msgid "view full size"
+msgstr "Ver a tamaño completo"
 
 #: include/text.php:304
 msgid "newer"
@@ -3077,25 +2955,146 @@ msgstr "Publicación"
 msgid "Item filed"
 msgstr "Elemento archivado"
 
-#: include/Contact.php:119
-msgid "stopped following"
-msgstr "dejó de seguir"
+#: include/user.php:39 mod/settings.php:373
+msgid "Passwords do not match. Password unchanged."
+msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada."
 
-#: include/Contact.php:395
-msgid "Drop Contact"
-msgstr "Eliminar contacto"
+#: include/user.php:48
+msgid "An invitation is required."
+msgstr "Se necesita invitación."
 
-#: include/Contact.php:770
-msgid "Organisation"
-msgstr "Organización"
+#: include/user.php:53
+msgid "Invitation could not be verified."
+msgstr "No se puede verificar la invitación."
 
-#: include/Contact.php:773
-msgid "News"
-msgstr "Noticias"
+#: include/user.php:61
+msgid "Invalid OpenID url"
+msgstr "Dirección OpenID no válida"
 
-#: include/Contact.php:776
-msgid "Forum"
-msgstr "Foro"
+#: include/user.php:82
+msgid "Please enter the required information."
+msgstr "Por favor, introduce la información necesaria."
+
+#: include/user.php:96
+msgid "Please use a shorter name."
+msgstr "Por favor, usa un nombre más corto."
+
+#: include/user.php:98
+msgid "Name too short."
+msgstr "El nombre es demasiado corto."
+
+#: include/user.php:113
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "No parece que ese sea tu nombre completo."
+
+#: include/user.php:118
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio."
+
+#: include/user.php:121
+msgid "Not a valid email address."
+msgstr "No es una dirección de correo electrónico válida."
+
+#: include/user.php:134
+msgid "Cannot use that email."
+msgstr "No se puede utilizar este correo electrónico."
+
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+msgstr "El apodo solo puede contener  \"a-z\", \"0-9\" y \"_\"."
+
+#: include/user.php:147 include/user.php:245
+msgid "Nickname is already registered. Please choose another."
+msgstr "Apodo ya registrado. Por favor, elije otro."
+
+#: include/user.php:157
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro."
+
+#: include/user.php:173
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado."
+
+#: include/user.php:231
+msgid "An error occurred during registration. Please try again."
+msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."
+
+#: include/user.php:256 view/theme/duepuntozero/config.php:44
+msgid "default"
+msgstr "predeterminado"
+
+#: include/user.php:266
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."
+
+#: include/user.php:345 include/user.php:352 include/user.php:359
+#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
+#: mod/profile_photo.php:210 mod/profile_photo.php:302
+#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
+#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
+#: mod/photos.php:1819
+msgid "Profile Photos"
+msgstr "Foto del perfil"
+
+#: include/user.php:390
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\t"
+msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrarse en %2$s. Su cuenta está pendiente de aprobación por el administrador.\n\t"
+
+#: include/user.php:400
+#, php-format
+msgid "Registration at %s"
+msgstr "Registro en %s"
+
+#: include/user.php:410
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t"
+msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t"
+
+#: include/user.php:414
+#, php-format
+msgid ""
+"\n"
+"\t\tThe login details are as follows:\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t%1$s\n"
+"\t\t\tPassword:\t%5$s\n"
+"\n"
+"\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\tin.\n"
+"\n"
+"\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\tthan that.\n"
+"\n"
+"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\n"
+"\t\tThank you and welcome to %2$s."
+msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2$s."
+
+#: include/user.php:446 mod/admin.php:1209
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalles de registro para %s"
 
 #: mod/oexchange.php:25
 msgid "Post successful."
@@ -3242,7 +3241,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña."
 
-#: mod/lostpass.php:109 boot.php:1793
+#: mod/lostpass.php:109 boot.php:1802
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -3308,7 +3307,7 @@ msgid ""
 "your email for further instructions."
 msgstr "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales."
 
-#: mod/lostpass.php:161 boot.php:1781
+#: mod/lostpass.php:161 boot.php:1790
 msgid "Nickname or Email: "
 msgstr "Apodo o Correo electrónico: "
 
@@ -3333,25 +3332,6 @@ msgstr "No se ha encontrado"
 msgid "Page not found."
 msgstr "Página no encontrada."
 
-#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
-#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
-#: mod/wall_attach.php:25 mod/wall_attach.php:76
-msgid "Invalid request."
-msgstr "Consulta invalida"
-
-#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:786
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "La imagen excede el limite de %s"
-
-#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:826
-msgid "Unable to process image."
-msgstr "Imposible procesar la imagen."
-
-#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:853
-msgid "Image upload failed."
-msgstr "Error al subir la imagen."
-
 #: mod/lockview.php:31 mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr "Privacidad de la información remota no disponible."
@@ -3369,13 +3349,13 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Cuenta no encontrada y el registro OpenID no está permitido en ese sitio."
 
-#: mod/uimport.php:50 mod/register.php:191
+#: mod/uimport.php:50 mod/register.php:198
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."
 
-#: mod/uimport.php:64 mod/register.php:286
+#: mod/uimport.php:64 mod/register.php:295
 msgid "Import"
 msgstr "Importar"
 
@@ -3553,10 +3533,8 @@ msgstr "Para más información sobre el Proyecto Friendica y sobre por qué pens
 #: mod/install.php:272 mod/install.php:312 mod/photos.php:1104
 #: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590
 #: mod/photos.php:1638 mod/photos.php:1724 object/Item.php:720
-#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80
-#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70
-#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633
-#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59
+#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64
+#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
 msgid "Submit"
 msgstr "Envíar"
 
@@ -3604,23 +3582,6 @@ msgstr "Selecciona una etiqueta para eliminar: "
 msgid "Remove"
 msgstr "Eliminar"
 
-#: mod/wall_attach.php:94
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite."
-
-#: mod/wall_attach.php:94
-msgid "Or - did you try to upload an empty file?"
-msgstr "Si no - intento de subir un archivo vacío?"
-
-#: mod/wall_attach.php:105
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "El archivo excede el limite de tamaño de %s"
-
-#: mod/wall_attach.php:156 mod/wall_attach.php:172
-msgid "File upload failed."
-msgstr "Ha fallado la subida del archivo."
-
 #: mod/repair_ostatus.php:14
 msgid "Resubscribing to OStatus contacts"
 msgstr "Resubscribir a contactos de OStatus"
@@ -3727,11 +3688,11 @@ msgstr "¿%s te conoce?"
 
 #: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861
 #: mod/profiles.php:648 mod/profiles.php:652 mod/profiles.php:677
-#: mod/register.php:239 mod/settings.php:1158 mod/settings.php:1164
-#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181
-#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199
-#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227
-#: mod/settings.php:1228 mod/settings.php:1229
+#: mod/register.php:246 mod/settings.php:1163 mod/settings.php:1169
+#: mod/settings.php:1177 mod/settings.php:1181 mod/settings.php:1186
+#: mod/settings.php:1192 mod/settings.php:1198 mod/settings.php:1204
+#: mod/settings.php:1230 mod/settings.php:1231 mod/settings.php:1232
+#: mod/settings.php:1233 mod/settings.php:1234
 msgid "No"
 msgstr "No"
 
@@ -4035,7 +3996,7 @@ msgstr "Miembros"
 msgid "All Contacts"
 msgstr "Todos los contactos"
 
-#: mod/group.php:193 mod/content.php:130 mod/network.php:495
+#: mod/group.php:193 mod/content.php:130 mod/network.php:496
 msgid "Group is empty"
 msgstr "El grupo está vacío"
 
@@ -4331,9 +4292,9 @@ msgid ""
 "entries from this contact."
 msgstr "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta."
 
-#: mod/crepair.php:165 mod/admin.php:1367 mod/admin.php:1380
-#: mod/admin.php:1392 mod/admin.php:1408 mod/settings.php:678
-#: mod/settings.php:704
+#: mod/crepair.php:165 mod/admin.php:1392 mod/admin.php:1405
+#: mod/admin.php:1418 mod/admin.php:1434 mod/settings.php:680
+#: mod/settings.php:706
 msgid "Name"
 msgstr "Nombre"
 
@@ -4519,11 +4480,11 @@ msgid ""
 " bar."
 msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora."
 
-#: mod/content.php:119 mod/network.php:468
+#: mod/content.php:119 mod/network.php:469
 msgid "No such group"
 msgstr "Ningún grupo"
 
-#: mod/content.php:135 mod/network.php:499
+#: mod/content.php:135 mod/network.php:500
 #, php-format
 msgid "Group: %s"
 msgstr "Grupo: %s"
@@ -4574,7 +4535,7 @@ msgstr "Este eres tú"
 
 #: mod/content.php:727 mod/content.php:945 mod/photos.php:1589
 #: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403
-#: object/Item.php:719 boot.php:969
+#: object/Item.php:719 boot.php:970
 msgid "Comment"
 msgstr "Comentar"
 
@@ -4610,7 +4571,7 @@ msgstr "Enlace"
 msgid "Video"
 msgstr "Vídeo"
 
-#: mod/content.php:746 mod/settings.php:738 object/Item.php:122
+#: mod/content.php:746 mod/settings.php:740 object/Item.php:122
 #: object/Item.php:124
 msgid "Edit"
 msgstr "Editar"
@@ -4816,6 +4777,15 @@ msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no
 msgid "Unable to process image"
 msgstr "Imposible procesar la imagen"
 
+#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr "La imagen excede el limite de %s"
+
+#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188
+msgid "Unable to process image."
+msgstr "Imposible procesar la imagen."
+
 #: mod/profile_photo.php:248
 msgid "Upload File:"
 msgstr "Subir archivo:"
@@ -4856,6 +4826,10 @@ msgstr "Editado"
 msgid "Image uploaded successfully."
 msgstr "Imagen subida con éxito."
 
+#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221
+msgid "Image upload failed."
+msgstr "Error al subir la imagen."
+
 #: mod/regmod.php:55
 msgid "Account approved."
 msgstr "Cuenta aprobada."
@@ -4925,7 +4899,7 @@ msgstr "Publica tu nueva amistad"
 msgid "if applicable"
 msgstr "Si corresponde"
 
-#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1382
+#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1408
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -5287,1384 +5261,6 @@ msgstr "Informacioń de contacto y Redes sociales"
 msgid "Edit/Manage Profiles"
 msgstr "Editar/Administrar perfiles"
 
-#: mod/admin.php:92
-msgid "Theme settings updated."
-msgstr "Configuración de la apariencia actualizada."
-
-#: mod/admin.php:156 mod/admin.php:926
-msgid "Site"
-msgstr "Sitio"
-
-#: mod/admin.php:157 mod/admin.php:870 mod/admin.php:1375 mod/admin.php:1390
-msgid "Users"
-msgstr "Usuarios"
-
-#: mod/admin.php:158 mod/admin.php:1492 mod/admin.php:1552 mod/settings.php:74
-msgid "Plugins"
-msgstr "Módulos"
-
-#: mod/admin.php:159 mod/admin.php:1750 mod/admin.php:1800
-msgid "Themes"
-msgstr "Temas"
-
-#: mod/admin.php:160 mod/settings.php:52
-msgid "Additional features"
-msgstr "Características adicionales"
-
-#: mod/admin.php:161
-msgid "DB updates"
-msgstr "Actualizaciones de la Base de Datos"
-
-#: mod/admin.php:162 mod/admin.php:397
-msgid "Inspect Queue"
-msgstr "Inspeccionar cola"
-
-#: mod/admin.php:163 mod/admin.php:363
-msgid "Federation Statistics"
-msgstr "Estadísticas de federación"
-
-#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1874
-msgid "Logs"
-msgstr "Registros"
-
-#: mod/admin.php:178 mod/admin.php:1942
-msgid "View Logs"
-msgstr "Ver registro de depuración"
-
-#: mod/admin.php:179
-msgid "probe address"
-msgstr "probar direccion"
-
-#: mod/admin.php:180
-msgid "check webfinger"
-msgstr "Verificar webfinger"
-
-#: mod/admin.php:187
-msgid "Plugin Features"
-msgstr "Características del módulo"
-
-#: mod/admin.php:189
-msgid "diagnostics"
-msgstr "diagnosticos"
-
-#: mod/admin.php:190
-msgid "User registrations waiting for confirmation"
-msgstr "Registro de usuarios esperando la confirmación"
-
-#: mod/admin.php:356
-msgid ""
-"This page offers you some numbers to the known part of the federated social "
-"network your Friendica node is part of. These numbers are not complete but "
-"only reflect the part of the network your node is aware of."
-msgstr "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. "
-
-#: mod/admin.php:357
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr "El modulo <em>directorio de contactos encontrados</em> no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí."
-
-#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:925
-#: mod/admin.php:1374 mod/admin.php:1491 mod/admin.php:1551 mod/admin.php:1749
-#: mod/admin.php:1799 mod/admin.php:1873 mod/admin.php:1941
-msgid "Administration"
-msgstr "Administración"
-
-#: mod/admin.php:369
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
-msgstr "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:"
-
-#: mod/admin.php:399
-msgid "ID"
-msgstr "ID"
-
-#: mod/admin.php:400
-msgid "Recipient Name"
-msgstr "Nombre del recipiente"
-
-#: mod/admin.php:401
-msgid "Recipient Profile"
-msgstr "Perfil del recipiente"
-
-#: mod/admin.php:403
-msgid "Created"
-msgstr "Creado"
-
-#: mod/admin.php:404
-msgid "Last Tried"
-msgstr "Ultimo intento"
-
-#: mod/admin.php:405
-msgid ""
-"This page lists the content of the queue for outgoing postings. These are "
-"postings the initial delivery failed for. They will be resend later and "
-"eventually deleted if the delivery fails permanently."
-msgstr "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. "
-
-#: mod/admin.php:424 mod/admin.php:1323
-msgid "Normal Account"
-msgstr "Cuenta normal"
-
-#: mod/admin.php:425 mod/admin.php:1324
-msgid "Soapbox Account"
-msgstr "Cuenta tribuna"
-
-#: mod/admin.php:426 mod/admin.php:1325
-msgid "Community/Celebrity Account"
-msgstr "Cuenta de Comunidad/Celebridad"
-
-#: mod/admin.php:427 mod/admin.php:1326
-msgid "Automatic Friend Account"
-msgstr "Cuenta de amistad automática"
-
-#: mod/admin.php:428
-msgid "Blog Account"
-msgstr "Cuenta de blog"
-
-#: mod/admin.php:429
-msgid "Private Forum"
-msgstr "Foro privado"
-
-#: mod/admin.php:455
-msgid "Message queues"
-msgstr "Cola de mensajes"
-
-#: mod/admin.php:461
-msgid "Summary"
-msgstr "Resumen"
-
-#: mod/admin.php:464
-msgid "Registered users"
-msgstr "Usuarios registrados"
-
-#: mod/admin.php:466
-msgid "Pending registrations"
-msgstr "Pendientes de registro"
-
-#: mod/admin.php:467
-msgid "Version"
-msgstr "Versión"
-
-#: mod/admin.php:472
-msgid "Active plugins"
-msgstr "Módulos activos"
-
-#: mod/admin.php:495
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr "No se puede resolver la direccion URL base.\nDeberá tener al menos <scheme>://<domain>"
-
-#: mod/admin.php:798
-msgid "RINO2 needs mcrypt php extension to work."
-msgstr "RINO2 precisa la extensión mcrypt para funcionar.  "
-
-#: mod/admin.php:806
-msgid "Site settings updated."
-msgstr "Configuración de actualización."
-
-#: mod/admin.php:834 mod/settings.php:932
-msgid "No special theme for mobile devices"
-msgstr "No hay tema especial para dispositivos móviles"
-
-#: mod/admin.php:853
-msgid "No community page"
-msgstr "No hay pagina de comunidad"
-
-#: mod/admin.php:854
-msgid "Public postings from users of this site"
-msgstr "Temas públicos de perfiles de este sitio."
-
-#: mod/admin.php:855
-msgid "Global community page"
-msgstr "Pagina global de comunidad"
-
-#: mod/admin.php:860 mod/contacts.php:530
-msgid "Never"
-msgstr "Nunca"
-
-#: mod/admin.php:861
-msgid "At post arrival"
-msgstr "A la llegada de una publicación"
-
-#: mod/admin.php:869 mod/contacts.php:557
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: mod/admin.php:871
-msgid "Users, Global Contacts"
-msgstr "Perfiles, contactos globales"
-
-#: mod/admin.php:872
-msgid "Users, Global Contacts/fallback"
-msgstr "Perfiles, contactos globales/fallback"
-
-#: mod/admin.php:876
-msgid "One month"
-msgstr "Un mes"
-
-#: mod/admin.php:877
-msgid "Three months"
-msgstr "Tres meses"
-
-#: mod/admin.php:878
-msgid "Half a year"
-msgstr "Medio año"
-
-#: mod/admin.php:879
-msgid "One year"
-msgstr "Un año"
-
-#: mod/admin.php:884
-msgid "Multi user instance"
-msgstr "Sesión multi usuario"
-
-#: mod/admin.php:907
-msgid "Closed"
-msgstr "Cerrado"
-
-#: mod/admin.php:908
-msgid "Requires approval"
-msgstr "Requiere aprobación"
-
-#: mod/admin.php:909
-msgid "Open"
-msgstr "Abierto"
-
-#: mod/admin.php:913
-msgid "No SSL policy, links will track page SSL state"
-msgstr "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"
-
-#: mod/admin.php:914
-msgid "Force all links to use SSL"
-msgstr "Forzar todos los enlaces a utilizar SSL"
-
-#: mod/admin.php:915
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"
-
-#: mod/admin.php:927 mod/admin.php:1553 mod/admin.php:1801 mod/admin.php:1875
-#: mod/admin.php:2025 mod/settings.php:676 mod/settings.php:786
-#: mod/settings.php:833 mod/settings.php:902 mod/settings.php:992
-#: mod/settings.php:1259
-msgid "Save Settings"
-msgstr "Guardar configuración"
-
-#: mod/admin.php:928 mod/register.php:263
-msgid "Registration"
-msgstr "Registro"
-
-#: mod/admin.php:929
-msgid "File upload"
-msgstr "Subida de archivo"
-
-#: mod/admin.php:930
-msgid "Policies"
-msgstr "Políticas"
-
-#: mod/admin.php:932
-msgid "Auto Discovered Contact Directory"
-msgstr "Directorio de contactos descubierto automáticamente"
-
-#: mod/admin.php:933
-msgid "Performance"
-msgstr "Rendimiento"
-
-#: mod/admin.php:934
-msgid "Worker"
-msgstr "Trabajador (??)"
-
-#: mod/admin.php:935
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. "
-
-#: mod/admin.php:938
-msgid "Site name"
-msgstr "Nombre del sitio"
-
-#: mod/admin.php:939
-msgid "Host name"
-msgstr "Nombre de dominio"
-
-#: mod/admin.php:940
-msgid "Sender Email"
-msgstr "Dirección de origen de correo electrónico"
-
-#: mod/admin.php:940
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr "La dirección de correo electrónico que el servidor debería usar como dirección de envío."
-
-#: mod/admin.php:941
-msgid "Banner/Logo"
-msgstr "Imagen/Logotipo"
-
-#: mod/admin.php:942
-msgid "Shortcut icon"
-msgstr "Icono de atajo"
-
-#: mod/admin.php:942
-msgid "Link to an icon that will be used for browsers."
-msgstr "Enlace hacia un icono que sera usado para el navegador."
-
-#: mod/admin.php:943
-msgid "Touch icon"
-msgstr "Icono touch"
-
-#: mod/admin.php:943
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Enlace para un icono que sera usado para tablets y moviles."
-
-#: mod/admin.php:944
-msgid "Additional Info"
-msgstr "Información adicional"
-
-#: mod/admin.php:944
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo."
-
-#: mod/admin.php:945
-msgid "System language"
-msgstr "Idioma"
-
-#: mod/admin.php:946
-msgid "System theme"
-msgstr "Tema"
-
-#: mod/admin.php:946
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración <a href='#' id='cnftheme'>cambiar configuración del tema</a>"
-
-#: mod/admin.php:947
-msgid "Mobile system theme"
-msgstr "Tema de sistema móvil"
-
-#: mod/admin.php:947
-msgid "Theme for mobile devices"
-msgstr "Tema para dispositivos móviles"
-
-#: mod/admin.php:948
-msgid "SSL link policy"
-msgstr "Política de enlaces SSL"
-
-#: mod/admin.php:948
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Determina si los enlaces generados deben ser forzados a utilizar SSL"
-
-#: mod/admin.php:949
-msgid "Force SSL"
-msgstr "Forzar SSL"
-
-#: mod/admin.php:949
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable."
-
-#: mod/admin.php:950
-msgid "Old style 'Share'"
-msgstr "Viejo estilo de 'reenviar'"
-
-#: mod/admin.php:950
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr "Desactiva el elemento bbcode 'reenviar' para objetos repetidos."
-
-#: mod/admin.php:951
-msgid "Hide help entry from navigation menu"
-msgstr "Ocultar la ayuda en el menú de navegación"
-
-#: mod/admin.php:951
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente."
-
-#: mod/admin.php:952
-msgid "Single user instance"
-msgstr "Sesión de usuario único"
-
-#: mod/admin.php:952
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Haz esta sesión multi-usuario o usuario único para el usuario"
-
-#: mod/admin.php:953
-msgid "Maximum image size"
-msgstr "Tamaño máximo de la imagen"
-
-#: mod/admin.php:953
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite."
-
-#: mod/admin.php:954
-msgid "Maximum image length"
-msgstr "Largo máximo de imagen"
-
-#: mod/admin.php:954
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites."
-
-#: mod/admin.php:955
-msgid "JPEG image quality"
-msgstr "Calidad de imagen JPEG"
-
-#: mod/admin.php:955
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima."
-
-#: mod/admin.php:957
-msgid "Register policy"
-msgstr "Política de registros"
-
-#: mod/admin.php:958
-msgid "Maximum Daily Registrations"
-msgstr "Registros Máximos Diarios"
-
-#: mod/admin.php:958
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user"
-" registrations to accept per day.  If register is set to closed, this "
-"setting has no effect."
-msgstr "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto."
-
-#: mod/admin.php:959
-msgid "Register text"
-msgstr "Términos"
-
-#: mod/admin.php:959
-msgid "Will be displayed prominently on the registration page."
-msgstr "Se mostrará en un lugar destacado en la página de registro."
-
-#: mod/admin.php:960
-msgid "Accounts abandoned after x days"
-msgstr "Cuentas abandonadas después de x días"
-
-#: mod/admin.php:960
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal."
-
-#: mod/admin.php:961
-msgid "Allowed friend domains"
-msgstr "Dominios amigos permitidos"
-
-#: mod/admin.php:961
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
-
-#: mod/admin.php:962
-msgid "Allowed email domains"
-msgstr "Dominios de correo permitidos"
-
-#: mod/admin.php:962
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
-
-#: mod/admin.php:963
-msgid "Block public"
-msgstr "Bloqueo público"
-
-#: mod/admin.php:963
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión."
-
-#: mod/admin.php:964
-msgid "Force publish"
-msgstr "Forzar publicación"
-
-#: mod/admin.php:964
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio."
-
-#: mod/admin.php:965
-msgid "Global directory URL"
-msgstr "URL del directorio global."
-
-#: mod/admin.php:965
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia."
-
-#: mod/admin.php:966
-msgid "Allow threaded items"
-msgstr "Permitir elementos en hilo"
-
-#: mod/admin.php:966
-msgid "Allow infinite level threading for items on this site."
-msgstr "Permitir infinitos niveles de hilo para los elementos de este sitio."
-
-#: mod/admin.php:967
-msgid "Private posts by default for new users"
-msgstr "Publicaciones privadas por defecto para usuarios nuevos"
-
-#: mod/admin.php:967
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público."
-
-#: mod/admin.php:968
-msgid "Don't include post content in email notifications"
-msgstr "No incluir el contenido del post en las notificaciones de correo electrónico"
-
-#: mod/admin.php:968
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad."
-
-#: mod/admin.php:969
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Deshabilitar acceso a addons listados en el menú de aplicaciones."
-
-#: mod/admin.php:969
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados."
-
-#: mod/admin.php:970
-msgid "Don't embed private images in posts"
-msgstr "No agregar imágenes privados en las publicaciones"
-
-#: mod/admin.php:970
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a "
-"while."
-msgstr "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar."
-
-#: mod/admin.php:971
-msgid "Allow Users to set remote_self"
-msgstr "Permitir a los usuarios de definir perfiles_remotos"
-
-#: mod/admin.php:971
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil."
-
-#: mod/admin.php:972
-msgid "Block multiple registrations"
-msgstr "Bloquear registros multiples"
-
-#: mod/admin.php:972
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Impedir que los usuarios registren cuentas adicionales para su uso como páginas."
-
-#: mod/admin.php:973
-msgid "OpenID support"
-msgstr "Soporte OpenID"
-
-#: mod/admin.php:973
-msgid "OpenID support for registration and logins."
-msgstr "Soporte OpenID para registros y accesos."
-
-#: mod/admin.php:974
-msgid "Fullname check"
-msgstr "Comprobar Nombre completo"
-
-#: mod/admin.php:974
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam"
-
-#: mod/admin.php:975
-msgid "UTF-8 Regular expressions"
-msgstr "Expresiones regulares UTF-8"
-
-#: mod/admin.php:975
-msgid "Use PHP UTF8 regular expressions"
-msgstr "Usar expresiones regulares de UTF8 en PHP"
-
-#: mod/admin.php:976
-msgid "Community Page Style"
-msgstr "Estilo de pagina de comunidad"
-
-#: mod/admin.php:976
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor."
-
-#: mod/admin.php:977
-msgid "Posts per user on community page"
-msgstr "Publicaciones por usuario en la pagina de comunidad"
-
-#: mod/admin.php:977
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')"
-
-#: mod/admin.php:978
-msgid "Enable OStatus support"
-msgstr "Permitir soporte OStatus"
-
-#: mod/admin.php:978
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas."
-
-#: mod/admin.php:979
-msgid "OStatus conversation completion interval"
-msgstr "Intervalo de actualización de conversaciones OStatus"
-
-#: mod/admin.php:979
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor."
-
-#: mod/admin.php:980
-msgid "Only import OStatus threads from our contacts"
-msgstr "Solo importar OStatus temas de nuestros (?) contactos."
-
-#: mod/admin.php:980
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option"
-" we only store threads that are started by a contact that is known on our "
-"system."
-msgstr "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)"
-
-#: mod/admin.php:981
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado."
-
-#: mod/admin.php:983
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory)."
-
-#: mod/admin.php:984
-msgid "Enable Diaspora support"
-msgstr "Habilitar el soporte para Diaspora*"
-
-#: mod/admin.php:984
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Provee una compatibilidad con la red de Diaspora."
-
-#: mod/admin.php:985
-msgid "Only allow Friendica contacts"
-msgstr "Permitir solo contactos de Friendica"
-
-#: mod/admin.php:985
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados."
-
-#: mod/admin.php:986
-msgid "Verify SSL"
-msgstr "Verificar SSL"
-
-#: mod/admin.php:986
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you"
-" cannot connect (at all) to self-signed SSL sites."
-msgstr "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados."
-
-#: mod/admin.php:987
-msgid "Proxy user"
-msgstr "Usuario proxy"
-
-#: mod/admin.php:988
-msgid "Proxy URL"
-msgstr "Dirección proxy"
-
-#: mod/admin.php:989
-msgid "Network timeout"
-msgstr "Tiempo de espera de red"
-
-#: mod/admin.php:989
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda)."
-
-#: mod/admin.php:990
-msgid "Delivery interval"
-msgstr "Intervalo de actualización"
-
-#: mod/admin.php:990
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados."
-
-#: mod/admin.php:991
-msgid "Poll interval"
-msgstr "Intervalo de sondeo"
-
-#: mod/admin.php:991
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega."
-
-#: mod/admin.php:992
-msgid "Maximum Load Average"
-msgstr "Promedio de carga máxima"
-
-#: mod/admin.php:992
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50."
-
-#: mod/admin.php:993
-msgid "Maximum Load Average (Frontend)"
-msgstr "Carga máxima promedio (frontend)"
-
-#: mod/admin.php:993
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50."
-
-#: mod/admin.php:994
-msgid "Maximum table size for optimization"
-msgstr "Tamaño máximo de las tablas para la optimización."
-
-#: mod/admin.php:994
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
-msgstr "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar."
-
-#: mod/admin.php:995
-msgid "Minimum level of fragmentation"
-msgstr "Nivel mínimo de fragmentación "
-
-#: mod/admin.php:995
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. "
-
-#: mod/admin.php:997
-msgid "Periodical check of global contacts"
-msgstr "Verificación periódica de los contactos globales."
-
-#: mod/admin.php:997
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores."
-
-#: mod/admin.php:998
-msgid "Days between requery"
-msgstr "Días entre búsquedas"
-
-#: mod/admin.php:998
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Cantidad de días hasta que un servidor es consultado por sus contactos."
-
-#: mod/admin.php:999
-msgid "Discover contacts from other servers"
-msgstr "Descubrir contactos de otros servidores"
-
-#: mod/admin.php:999
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
-msgstr "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'"
-
-#: mod/admin.php:1000
-msgid "Timeframe for fetching global contacts"
-msgstr "Intervalos de tiempo para revisar contactos globales."
-
-#: mod/admin.php:1000
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
-msgstr "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)"
-
-#: mod/admin.php:1001
-msgid "Search the local directory"
-msgstr "Buscar el directorio local"
-
-#: mod/admin.php:1001
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida."
-
-#: mod/admin.php:1003
-msgid "Publish server information"
-msgstr "Publicar información del servidor"
-
-#: mod/admin.php:1003
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a"
-" href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea <a href='http://the-federation.info/'>the-federation.info</a> por detalles."
-
-#: mod/admin.php:1005
-msgid "Use MySQL full text engine"
-msgstr "Usar motor MySQL de texto completo"
-
-#: mod/admin.php:1005
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres."
-
-#: mod/admin.php:1006
-msgid "Suppress Language"
-msgstr "Suprimir idiomas"
-
-#: mod/admin.php:1006
-msgid "Suppress language information in meta information about a posting."
-msgstr "Suprimir la información de datos meta sobre informaciones de idiomas en las publicaciones."
-
-#: mod/admin.php:1007
-msgid "Suppress Tags"
-msgstr "Suprimir tags"
-
-#: mod/admin.php:1007
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Suprimir la lista de tags al final de una publicación."
-
-#: mod/admin.php:1008
-msgid "Path to item cache"
-msgstr "Ruta a la caché del objeto"
-
-#: mod/admin.php:1008
-msgid "The item caches buffers generated bbcode and external images."
-msgstr "El buffer de cache de items generado para bbcodes e imágenes externas. "
-
-#: mod/admin.php:1009
-msgid "Cache duration in seconds"
-msgstr "Duración de la caché en segundos"
-
-#: mod/admin.php:1009
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One"
-" day). To disable the item cache, set the value to -1."
-msgstr "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1."
-
-#: mod/admin.php:1010
-msgid "Maximum numbers of comments per post"
-msgstr "Numero máximo de respuestas por tema"
-
-#: mod/admin.php:1010
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100."
-
-#: mod/admin.php:1011
-msgid "Path for lock file"
-msgstr "Ruta al archivo protegido"
-
-#: mod/admin.php:1011
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr "El archivo lock es usado para evitar multiples pooler (recolectores de información) a la vez. Defina solo una carpeta aquí."
-
-#: mod/admin.php:1012
-msgid "Temp path"
-msgstr "Ruta a los temporales"
-
-#: mod/admin.php:1012
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. "
-
-#: mod/admin.php:1013
-msgid "Base path to installation"
-msgstr "Ruta base para la instalación"
-
-#: mod/admin.php:1013
-msgid ""
-"If the system cannot detect the correct path to your installation, enter the"
-" correct path here. This setting should only be set if you are using a "
-"restricted system and symbolic links to your webroot."
-msgstr "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot."
-
-#: mod/admin.php:1014
-msgid "Disable picture proxy"
-msgstr "Deshabilitar proxy de imagen"
-
-#: mod/admin.php:1014
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda."
-
-#: mod/admin.php:1015
-msgid "Enable old style pager"
-msgstr "Habilitar paginación estilo viejo"
-
-#: mod/admin.php:1015
-msgid ""
-"The old style pager has page numbers but slows down massively the page "
-"speed."
-msgstr "La paginación al estilo viejo tiene números de paginas pero enlentece masivamente la velocidad de la pagina."
-
-#: mod/admin.php:1016
-msgid "Only search in tags"
-msgstr "Solo buscar en tags"
-
-#: mod/admin.php:1016
-msgid "On large systems the text search can slow down the system extremely."
-msgstr "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente."
-
-#: mod/admin.php:1018
-msgid "New base url"
-msgstr "Nueva URLbase"
-
-#: mod/admin.php:1018
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts"
-" of all users."
-msgstr "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN."
-
-#: mod/admin.php:1020
-msgid "RINO Encryption"
-msgstr "Encryptado RINO"
-
-#: mod/admin.php:1020
-msgid "Encryption layer between nodes."
-msgstr "Capa de encryptación entre nodos."
-
-#: mod/admin.php:1021
-msgid "Embedly API key"
-msgstr "Embedly llave de API (API key) "
-
-#: mod/admin.php:1021
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr "<a href='http://embed.ly'>Embedly</a> es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional."
-
-#: mod/admin.php:1023
-msgid "Enable 'worker' background processing"
-msgstr "Habilitar procesos de fondo del \"trabajador\""
-
-#: mod/admin.php:1023
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
-msgstr "Limita los procesos del trabajo de fondo del numero paralelo de trabajos a un numero máximo que respeta la carga del sistema."
-
-#: mod/admin.php:1024
-msgid "Maximum number of parallel workers"
-msgstr "Numero máximo de trabajos paralelos de fondo."
-
-#: mod/admin.php:1024
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4."
-
-#: mod/admin.php:1025
-msgid "Don't use 'proc_open' with the worker"
-msgstr "No use 'proc_open' junto al \"trabajador\"!"
-
-#: mod/admin.php:1025
-msgid ""
-"Enable this if your system doesn't allow the use of 'proc_open'. This can "
-"happen on shared hosters. If this is enabled you should increase the "
-"frequency of poller calls in your crontab."
-msgstr "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)"
-
-#: mod/admin.php:1026
-msgid "Enable fastlane"
-msgstr "Habilitar ascenso rápido"
-
-#: mod/admin.php:1026
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes"
-" with higher priority are blocked by processes of lower priority."
-msgstr "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad."
-
-#: mod/admin.php:1055
-msgid "Update has been marked successful"
-msgstr "La actualización se ha completado con éxito"
-
-#: mod/admin.php:1063
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr "Actualización de base de datos %s fue aplicada con éxito."
-
-#: mod/admin.php:1066
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s"
-
-#: mod/admin.php:1078
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Paso %s fallo con el error: %s"
-
-#: mod/admin.php:1081
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Actualización %s aplicada con éxito."
-
-#: mod/admin.php:1085
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "La actualización %s no ha informado, se desconoce el estado."
-
-#: mod/admin.php:1087
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr "No había función adicional de actualización %s que necesitaba ser requerida."
-
-#: mod/admin.php:1106
-msgid "No failed updates."
-msgstr "Actualizaciones sin fallos."
-
-#: mod/admin.php:1107
-msgid "Check database structure"
-msgstr "Revisar estructura de la base de datos"
-
-#: mod/admin.php:1112
-msgid "Failed Updates"
-msgstr "Actualizaciones fallidas"
-
-#: mod/admin.php:1113
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "No se incluyen las anteriores a la 1139, que no indicaban su estado."
-
-#: mod/admin.php:1114
-msgid "Mark success (if update was manually applied)"
-msgstr "Marcar como correcta (si actualizaste manualmente)"
-
-#: mod/admin.php:1115
-msgid "Attempt to execute this update step automatically"
-msgstr "Intentando ejecutar este paso automáticamente"
-
-#: mod/admin.php:1149
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\n\t\t\tEstimado %1$s,\n\t\t\t\tel administrador de %2$s ha creado una cuenta para usted."
-
-#: mod/admin.php:1152
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1$s\n\t\t\tNombre de la cuenta:\t\t%2$s\n\t\t\tContraseña:\t\t%3$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4$s."
-
-#: mod/admin.php:1196
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s usuario bloqueado/desbloqueado"
-msgstr[1] "%s usuarios bloqueados/desbloqueados"
-
-#: mod/admin.php:1203
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s usuario eliminado"
-msgstr[1] "%s usuarios eliminados"
-
-#: mod/admin.php:1250
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Usuario '%s' eliminado"
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Usuario '%s' desbloqueado"
-
-#: mod/admin.php:1258
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Usuario '%s' bloqueado'"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Register date"
-msgstr "Fecha de registro"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last login"
-msgstr "Último acceso"
-
-#: mod/admin.php:1367 mod/admin.php:1392
-msgid "Last item"
-msgstr "Último elemento"
-
-#: mod/admin.php:1367 mod/settings.php:43
-msgid "Account"
-msgstr "Cuenta"
-
-#: mod/admin.php:1376
-msgid "Add User"
-msgstr "Agregar usuario"
-
-#: mod/admin.php:1377
-msgid "select all"
-msgstr "seleccionar todo"
-
-#: mod/admin.php:1378
-msgid "User registrations waiting for confirm"
-msgstr "Registro de usuarios esperando confirmación"
-
-#: mod/admin.php:1379
-msgid "User waiting for permanent deletion"
-msgstr "Usuario esperando anulación permanente."
-
-#: mod/admin.php:1380
-msgid "Request date"
-msgstr "Solicitud de fecha"
-
-#: mod/admin.php:1381
-msgid "No registrations."
-msgstr "Sin registros."
-
-#: mod/admin.php:1383
-msgid "Deny"
-msgstr "Denegado"
-
-#: mod/admin.php:1385 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Block"
-msgstr "Bloquear"
-
-#: mod/admin.php:1386 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:992
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: mod/admin.php:1387
-msgid "Site admin"
-msgstr "Administrador de la web"
-
-#: mod/admin.php:1388
-msgid "Account expired"
-msgstr "Cuenta caducada"
-
-#: mod/admin.php:1391
-msgid "New User"
-msgstr "Nuevo usuario"
-
-#: mod/admin.php:1392
-msgid "Deleted since"
-msgstr "Borrado desde"
-
-#: mod/admin.php:1397
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: mod/admin.php:1398
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
-
-#: mod/admin.php:1408
-msgid "Name of the new user."
-msgstr "Nombre del nuevo usuario"
-
-#: mod/admin.php:1409
-msgid "Nickname"
-msgstr "Apodo"
-
-#: mod/admin.php:1409
-msgid "Nickname of the new user."
-msgstr "Apodo del nuevo perfil."
-
-#: mod/admin.php:1410
-msgid "Email address of the new user."
-msgstr "Dirección de correo del nuevo perfil."
-
-#: mod/admin.php:1453
-#, php-format
-msgid "Plugin %s disabled."
-msgstr "Módulo %s deshabilitado."
-
-#: mod/admin.php:1457
-#, php-format
-msgid "Plugin %s enabled."
-msgstr "Módulo %s habilitado."
-
-#: mod/admin.php:1468 mod/admin.php:1704
-msgid "Disable"
-msgstr "Desactivado"
-
-#: mod/admin.php:1470 mod/admin.php:1706
-msgid "Enable"
-msgstr "Activado"
-
-#: mod/admin.php:1493 mod/admin.php:1751
-msgid "Toggle"
-msgstr "Activar"
-
-#: mod/admin.php:1501 mod/admin.php:1760
-msgid "Author: "
-msgstr "Autor:"
-
-#: mod/admin.php:1502 mod/admin.php:1761
-msgid "Maintainer: "
-msgstr "Mantenedor: "
-
-#: mod/admin.php:1554
-msgid "Reload active plugins"
-msgstr "Recargar plugins activos"
-
-#: mod/admin.php:1559
-#, php-format
-msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
-msgstr "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2$s ."
-
-#: mod/admin.php:1664
-msgid "No themes found."
-msgstr "No se encontraron temas."
-
-#: mod/admin.php:1742
-msgid "Screenshot"
-msgstr "Captura de pantalla"
-
-#: mod/admin.php:1802
-msgid "Reload active themes"
-msgstr "Recargar interfaces de usuario activos"
-
-#: mod/admin.php:1807
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
-msgstr "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1$s"
-
-#: mod/admin.php:1808
-msgid "[Experimental]"
-msgstr "[Experimental]"
-
-#: mod/admin.php:1809
-msgid "[Unsupported]"
-msgstr "[Sin soporte]"
-
-#: mod/admin.php:1833
-msgid "Log settings updated."
-msgstr "Configuración de registro actualizada."
-
-#: mod/admin.php:1865
-msgid "PHP log currently enabled."
-msgstr "Registro PHP actualmente disponible."
-
-#: mod/admin.php:1867
-msgid "PHP log currently disabled."
-msgstr "Registro PHP actualmente deshabilitado."
-
-#: mod/admin.php:1876
-msgid "Clear"
-msgstr "Limpiar"
-
-#: mod/admin.php:1881
-msgid "Enable Debugging"
-msgstr "Habilitar debugging"
-
-#: mod/admin.php:1882
-msgid "Log file"
-msgstr "Archivo de registro"
-
-#: mod/admin.php:1882
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
-
-#: mod/admin.php:1883
-msgid "Log level"
-msgstr "Nivel de registro"
-
-#: mod/admin.php:1886
-msgid "PHP logging"
-msgstr "PHP logging"
-
-#: mod/admin.php:1887
-msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo."
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "Off"
-msgstr "Apagado"
-
-#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:776
-msgid "On"
-msgstr "Encendido"
-
-#: mod/admin.php:2015
-#, php-format
-msgid "Lock feature %s"
-msgstr "Trancar opción %s "
-
-#: mod/admin.php:2023
-msgid "Manage Additional Features"
-msgstr "Administrar opciones adicionales"
-
 #: mod/allfriends.php:43
 msgid "No friends to display."
 msgstr "No hay amigos para mostrar."
@@ -6791,6 +5387,10 @@ msgstr "%s está compartiendo contigo"
 msgid "Private communications are not available for this contact."
 msgstr "Las comunicaciones privadas no está disponibles para este contacto."
 
+#: mod/contacts.php:530 mod/admin.php:885
+msgid "Never"
+msgstr "Nunca"
+
 #: mod/contacts.php:534
 msgid "(Update was successful)"
 msgstr "(La actualización se ha completado)"
@@ -6816,6 +5416,10 @@ msgstr "¡Se ha perdido la comunicación con este contacto!"
 msgid "Fetch further information for feeds"
 msgstr "Recaudar informacion complementaria de los feeds"
 
+#: mod/contacts.php:557 mod/admin.php:894
+msgid "Disabled"
+msgstr "Deshabilitado"
+
 #: mod/contacts.php:557
 msgid "Fetch information"
 msgstr "Recaudar informacion"
@@ -6875,6 +5479,16 @@ msgstr "Actualizar publicaciones públicas"
 msgid "Update now"
 msgstr "Actualizar ahora"
 
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1412
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: mod/contacts.php:605 mod/contacts.php:805 mod/contacts.php:992
+#: mod/admin.php:1411
+msgid "Block"
+msgstr "Bloquear"
+
 #: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:1000
 msgid "Unignore"
 msgstr "Quitar de Ignorados"
@@ -6978,7 +5592,7 @@ msgstr "Mostrar solo contactos ocultos"
 msgid "Search your contacts"
 msgstr "Buscar en tus contactos"
 
-#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:702
+#: mod/contacts.php:804 mod/settings.php:158 mod/settings.php:704
 msgid "Update"
 msgstr "Actualizar"
 
@@ -7035,7 +5649,6 @@ msgid "Delete contact"
 msgstr "Eliminar contacto"
 
 #: mod/directory.php:197 view/theme/vier/theme.php:201
-#: view/theme/diabook/theme.php:525
 msgid "Global Directory"
 msgstr "Directorio global"
 
@@ -7474,41 +6087,6 @@ msgid ""
 "poller."
 msgstr "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"
 
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr "No se puede encontrar la publicación original."
-
-#: mod/item.php:340
-msgid "Empty post discarded."
-msgstr "Publicación vacía descartada."
-
-#: mod/item.php:895
-msgid "System error. Post not saved."
-msgstr "Error del sistema. Mensaje no guardado."
-
-#: mod/item.php:985
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Este mensaje te lo ha enviado %s, miembro de la red social Friendica."
-
-#: mod/item.php:987
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Los puedes visitar en línea en %s"
-
-#: mod/item.php:988
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."
-
-#: mod/item.php:992
-#, php-format
-msgid "%s posted an update."
-msgstr "%s ha publicado una actualización."
-
 #: mod/maintenance.php:9
 msgid "System down for maintenance"
 msgstr "Servicio suspendido por mantenimiento"
@@ -7525,67 +6103,1513 @@ msgstr "estás interesado en:"
 msgid "Profile Match"
 msgstr "Coincidencias de Perfil"
 
+#: mod/profile.php:179
+msgid "Tips for New Members"
+msgstr "Consejos para nuevos miembros"
+
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr "¿Estás seguro de que quieres borrar esta sugerencia?"
+
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."
+
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
+msgstr "Ignorar/Ocultar"
+
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contenido incrustado - recarga la página para verlo]"
+
+#: mod/admin.php:92
+msgid "Theme settings updated."
+msgstr "Configuración de la apariencia actualizada."
+
+#: mod/admin.php:156 mod/admin.php:951
+msgid "Site"
+msgstr "Sitio"
+
+#: mod/admin.php:157 mod/admin.php:895 mod/admin.php:1400 mod/admin.php:1416
+msgid "Users"
+msgstr "Usuarios"
+
+#: mod/admin.php:158 mod/admin.php:1518 mod/admin.php:1578 mod/settings.php:74
+msgid "Plugins"
+msgstr "Módulos"
+
+#: mod/admin.php:159 mod/admin.php:1776 mod/admin.php:1826
+msgid "Themes"
+msgstr "Temas"
+
+#: mod/admin.php:160 mod/settings.php:52
+msgid "Additional features"
+msgstr "Características adicionales"
+
+#: mod/admin.php:161
+msgid "DB updates"
+msgstr "Actualizaciones de la Base de Datos"
+
+#: mod/admin.php:162 mod/admin.php:406
+msgid "Inspect Queue"
+msgstr "Inspeccionar cola"
+
+#: mod/admin.php:163 mod/admin.php:372
+msgid "Federation Statistics"
+msgstr "Estadísticas de federación"
+
+#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1900
+msgid "Logs"
+msgstr "Registros"
+
+#: mod/admin.php:178 mod/admin.php:1968
+msgid "View Logs"
+msgstr "Ver registro de depuración"
+
+#: mod/admin.php:179
+msgid "probe address"
+msgstr "probar direccion"
+
+#: mod/admin.php:180
+msgid "check webfinger"
+msgstr "Verificar webfinger"
+
+#: mod/admin.php:187
+msgid "Plugin Features"
+msgstr "Características del módulo"
+
+#: mod/admin.php:189
+msgid "diagnostics"
+msgstr "diagnosticos"
+
+#: mod/admin.php:190
+msgid "User registrations waiting for confirmation"
+msgstr "Registro de usuarios esperando la confirmación"
+
+#: mod/admin.php:306
+msgid "unknown"
+msgstr "desconocido"
+
+#: mod/admin.php:365
+msgid ""
+"This page offers you some numbers to the known part of the federated social "
+"network your Friendica node is part of. These numbers are not complete but "
+"only reflect the part of the network your node is aware of."
+msgstr "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. "
+
+#: mod/admin.php:366
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
+msgstr "El modulo <em>directorio de contactos encontrados</em> no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí."
+
+#: mod/admin.php:371 mod/admin.php:405 mod/admin.php:483 mod/admin.php:950
+#: mod/admin.php:1399 mod/admin.php:1517 mod/admin.php:1577 mod/admin.php:1775
+#: mod/admin.php:1825 mod/admin.php:1899 mod/admin.php:1967
+msgid "Administration"
+msgstr "Administración"
+
+#: mod/admin.php:378
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
+msgstr "Actualmente este nodo reconoce %d nodos de las siguientes plataformas:"
+
+#: mod/admin.php:408
+msgid "ID"
+msgstr "ID"
+
+#: mod/admin.php:409
+msgid "Recipient Name"
+msgstr "Nombre del recipiente"
+
+#: mod/admin.php:410
+msgid "Recipient Profile"
+msgstr "Perfil del recipiente"
+
+#: mod/admin.php:412
+msgid "Created"
+msgstr "Creado"
+
+#: mod/admin.php:413
+msgid "Last Tried"
+msgstr "Ultimo intento"
+
+#: mod/admin.php:414
+msgid ""
+"This page lists the content of the queue for outgoing postings. These are "
+"postings the initial delivery failed for. They will be resend later and "
+"eventually deleted if the delivery fails permanently."
+msgstr "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. "
+
+#: mod/admin.php:438
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should"
+" change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the "
+"<tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your "
+"Friendica installation.<br />"
+msgstr "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea <a href=\"%s\">aquí</a> para una guía que puede ayudar a convertir las tablas de motor. También puede usar <tt>convert_innodb.sql</tt> en el directorio <tt>/util</tt> de su instalación de Friendica.<br />"
+
+#: mod/admin.php:443
+msgid ""
+"You are using a MySQL version which does not support all features that "
+"Friendica uses. You should consider switching to MariaDB."
+msgstr "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB."
+
+#: mod/admin.php:447 mod/admin.php:1348
+msgid "Normal Account"
+msgstr "Cuenta normal"
+
+#: mod/admin.php:448 mod/admin.php:1349
+msgid "Soapbox Account"
+msgstr "Cuenta tribuna"
+
+#: mod/admin.php:449 mod/admin.php:1350
+msgid "Community/Celebrity Account"
+msgstr "Cuenta de Comunidad/Celebridad"
+
+#: mod/admin.php:450 mod/admin.php:1351
+msgid "Automatic Friend Account"
+msgstr "Cuenta de amistad automática"
+
+#: mod/admin.php:451
+msgid "Blog Account"
+msgstr "Cuenta de blog"
+
+#: mod/admin.php:452
+msgid "Private Forum"
+msgstr "Foro privado"
+
+#: mod/admin.php:478
+msgid "Message queues"
+msgstr "Cola de mensajes"
+
+#: mod/admin.php:484
+msgid "Summary"
+msgstr "Resumen"
+
+#: mod/admin.php:487
+msgid "Registered users"
+msgstr "Usuarios registrados"
+
+#: mod/admin.php:489
+msgid "Pending registrations"
+msgstr "Pendientes de registro"
+
+#: mod/admin.php:490
+msgid "Version"
+msgstr "Versión"
+
+#: mod/admin.php:495
+msgid "Active plugins"
+msgstr "Módulos activos"
+
+#: mod/admin.php:520
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr "No se puede resolver la direccion URL base.\nDeberá tener al menos <scheme>://<domain>"
+
+#: mod/admin.php:823
+msgid "RINO2 needs mcrypt php extension to work."
+msgstr "RINO2 precisa la extensión mcrypt para funcionar.  "
+
+#: mod/admin.php:831
+msgid "Site settings updated."
+msgstr "Configuración de actualización."
+
+#: mod/admin.php:859 mod/settings.php:934
+msgid "No special theme for mobile devices"
+msgstr "No hay tema especial para dispositivos móviles"
+
+#: mod/admin.php:878
+msgid "No community page"
+msgstr "No hay pagina de comunidad"
+
+#: mod/admin.php:879
+msgid "Public postings from users of this site"
+msgstr "Temas públicos de perfiles de este sitio."
+
+#: mod/admin.php:880
+msgid "Global community page"
+msgstr "Pagina global de comunidad"
+
+#: mod/admin.php:886
+msgid "At post arrival"
+msgstr "A la llegada de una publicación"
+
+#: mod/admin.php:896
+msgid "Users, Global Contacts"
+msgstr "Perfiles, contactos globales"
+
+#: mod/admin.php:897
+msgid "Users, Global Contacts/fallback"
+msgstr "Perfiles, contactos globales/fallback"
+
+#: mod/admin.php:901
+msgid "One month"
+msgstr "Un mes"
+
+#: mod/admin.php:902
+msgid "Three months"
+msgstr "Tres meses"
+
+#: mod/admin.php:903
+msgid "Half a year"
+msgstr "Medio año"
+
+#: mod/admin.php:904
+msgid "One year"
+msgstr "Un año"
+
+#: mod/admin.php:909
+msgid "Multi user instance"
+msgstr "Sesión multi usuario"
+
+#: mod/admin.php:932
+msgid "Closed"
+msgstr "Cerrado"
+
+#: mod/admin.php:933
+msgid "Requires approval"
+msgstr "Requiere aprobación"
+
+#: mod/admin.php:934
+msgid "Open"
+msgstr "Abierto"
+
+#: mod/admin.php:938
+msgid "No SSL policy, links will track page SSL state"
+msgstr "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"
+
+#: mod/admin.php:939
+msgid "Force all links to use SSL"
+msgstr "Forzar todos los enlaces a utilizar SSL"
+
+#: mod/admin.php:940
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"
+
+#: mod/admin.php:952 mod/admin.php:1579 mod/admin.php:1827 mod/admin.php:1901
+#: mod/admin.php:2051 mod/settings.php:678 mod/settings.php:788
+#: mod/settings.php:835 mod/settings.php:904 mod/settings.php:996
+#: mod/settings.php:1264
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: mod/admin.php:953 mod/register.php:272
+msgid "Registration"
+msgstr "Registro"
+
+#: mod/admin.php:954
+msgid "File upload"
+msgstr "Subida de archivo"
+
+#: mod/admin.php:955
+msgid "Policies"
+msgstr "Políticas"
+
+#: mod/admin.php:957
+msgid "Auto Discovered Contact Directory"
+msgstr "Directorio de contactos descubierto automáticamente"
+
+#: mod/admin.php:958
+msgid "Performance"
+msgstr "Rendimiento"
+
+#: mod/admin.php:959
+msgid "Worker"
+msgstr "Trabajador (??)"
+
+#: mod/admin.php:960
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr "Reubicación - ADVERTENCIA: función avanzada. Puede hacer a este servidor inaccesible. "
+
+#: mod/admin.php:963
+msgid "Site name"
+msgstr "Nombre del sitio"
+
+#: mod/admin.php:964
+msgid "Host name"
+msgstr "Nombre de dominio"
+
+#: mod/admin.php:965
+msgid "Sender Email"
+msgstr "Dirección de origen de correo electrónico"
+
+#: mod/admin.php:965
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr "La dirección de correo electrónico que el servidor debería usar como dirección de envío."
+
+#: mod/admin.php:966
+msgid "Banner/Logo"
+msgstr "Imagen/Logotipo"
+
+#: mod/admin.php:967
+msgid "Shortcut icon"
+msgstr "Icono de atajo"
+
+#: mod/admin.php:967
+msgid "Link to an icon that will be used for browsers."
+msgstr "Enlace hacia un icono que sera usado para el navegador."
+
+#: mod/admin.php:968
+msgid "Touch icon"
+msgstr "Icono touch"
+
+#: mod/admin.php:968
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr "Enlace para un icono que sera usado para tablets y moviles."
+
+#: mod/admin.php:969
+msgid "Additional Info"
+msgstr "Información adicional"
+
+#: mod/admin.php:969
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
+msgstr "Para servidores públicos: información adicional  que sera publicado en %s/siteinfo."
+
+#: mod/admin.php:970
+msgid "System language"
+msgstr "Idioma"
+
+#: mod/admin.php:971
+msgid "System theme"
+msgstr "Tema"
+
+#: mod/admin.php:971
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Tema por defecto del sistema, los usuarios podrán elegir el suyo propio en su configuración <a href='#' id='cnftheme'>cambiar configuración del tema</a>"
+
+#: mod/admin.php:972
+msgid "Mobile system theme"
+msgstr "Tema de sistema móvil"
+
+#: mod/admin.php:972
+msgid "Theme for mobile devices"
+msgstr "Tema para dispositivos móviles"
+
+#: mod/admin.php:973
+msgid "SSL link policy"
+msgstr "Política de enlaces SSL"
+
+#: mod/admin.php:973
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Determina si los enlaces generados deben ser forzados a utilizar SSL"
+
+#: mod/admin.php:974
+msgid "Force SSL"
+msgstr "Forzar SSL"
+
+#: mod/admin.php:974
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
+" to endless loops."
+msgstr "Forzar todos las consultas No-SSL a SSL. - ATENCIÓN: en algunos sistemas esto puede generar comportamiento recursivo interminable."
+
+#: mod/admin.php:975
+msgid "Old style 'Share'"
+msgstr "Viejo estilo de 'reenviar'"
+
+#: mod/admin.php:975
+msgid "Deactivates the bbcode element 'share' for repeating items."
+msgstr "Desactiva el elemento bbcode 'reenviar' para objetos repetidos."
+
+#: mod/admin.php:976
+msgid "Hide help entry from navigation menu"
+msgstr "Ocultar la ayuda en el menú de navegación"
+
+#: mod/admin.php:976
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Oculta la entrada de las páginas de Ayuda en el menú de navegación. Todavía se puede acceder escribiendo /ayuda directamente."
+
+#: mod/admin.php:977
+msgid "Single user instance"
+msgstr "Sesión de usuario único"
+
+#: mod/admin.php:977
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Haz esta sesión multi-usuario o usuario único para el usuario"
+
+#: mod/admin.php:978
+msgid "Maximum image size"
+msgstr "Tamaño máximo de la imagen"
+
+#: mod/admin.php:978
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Tamaño máximo en bytes de las imágenes a subir. Por defecto es 0, que quiere decir que no hay límite."
+
+#: mod/admin.php:979
+msgid "Maximum image length"
+msgstr "Largo máximo de imagen"
+
+#: mod/admin.php:979
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Longitud máxima en píxeles del lado más largo de las imágenes subidas. Por defecto es -1, que significa que no hay límites."
+
+#: mod/admin.php:980
+msgid "JPEG image quality"
+msgstr "Calidad de imagen JPEG"
+
+#: mod/admin.php:980
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Los archivos JPEG subidos se guardarán con este ajuste de calidad [0-100]. Por defecto es 100, que es calidad máxima."
+
+#: mod/admin.php:982
+msgid "Register policy"
+msgstr "Política de registros"
+
+#: mod/admin.php:983
+msgid "Maximum Daily Registrations"
+msgstr "Registros Máximos Diarios"
+
+#: mod/admin.php:983
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user"
+" registrations to accept per day.  If register is set to closed, this "
+"setting has no effect."
+msgstr "Si anteriormente se ha permitido el registro, esto establece el número máximo de registro de nuevos usuarios aceptados por día. Si el registro se establece como cerrado, esta opción no tiene efecto."
+
+#: mod/admin.php:984
+msgid "Register text"
+msgstr "Términos"
+
+#: mod/admin.php:984
+msgid "Will be displayed prominently on the registration page."
+msgstr "Se mostrará en un lugar destacado en la página de registro."
+
+#: mod/admin.php:985
+msgid "Accounts abandoned after x days"
+msgstr "Cuentas abandonadas después de x días"
+
+#: mod/admin.php:985
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creando sondeos a sitios externos para cuentas abandonadas. Introduce 0 para ningún límite temporal."
+
+#: mod/admin.php:986
+msgid "Allowed friend domains"
+msgstr "Dominios amigos permitidos"
+
+#: mod/admin.php:986
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Lista separada por comas de los dominios que están autorizados para establecer conexiones con este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: mod/admin.php:987
+msgid "Allowed email domains"
+msgstr "Dominios de correo permitidos"
+
+#: mod/admin.php:987
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Lista separada por comas de los dominios que están autorizados en las direcciones de correo para registrarse en este sitio. Se aceptan comodines. Dejar en blanco para permitir cualquier dominio"
+
+#: mod/admin.php:988
+msgid "Block public"
+msgstr "Bloqueo público"
+
+#: mod/admin.php:988
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Marca para bloquear el acceso público a todas las páginas personales, aún siendo públicas, hasta que no hayas iniciado tu sesión."
+
+#: mod/admin.php:989
+msgid "Force publish"
+msgstr "Forzar publicación"
+
+#: mod/admin.php:989
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Marca para forzar que todos los perfiles de este sitio sean listados en el directorio del sitio."
+
+#: mod/admin.php:990
+msgid "Global directory URL"
+msgstr "URL del directorio global."
+
+#: mod/admin.php:990
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr "URL del directorio global. Si se deja este campo vacío, el directorio global sera completamente inaccesible para la instancia."
+
+#: mod/admin.php:991
+msgid "Allow threaded items"
+msgstr "Permitir elementos en hilo"
+
+#: mod/admin.php:991
+msgid "Allow infinite level threading for items on this site."
+msgstr "Permitir infinitos niveles de hilo para los elementos de este sitio."
+
+#: mod/admin.php:992
+msgid "Private posts by default for new users"
+msgstr "Publicaciones privadas por defecto para usuarios nuevos"
+
+#: mod/admin.php:992
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Ajusta los permisos de publicación por defecto a los miembros nuevos al grupo privado por defecto en vez del público."
+
+#: mod/admin.php:993
+msgid "Don't include post content in email notifications"
+msgstr "No incluir el contenido del post en las notificaciones de correo electrónico"
+
+#: mod/admin.php:993
+msgid ""
+"Don't include the content of a post/comment/private message/etc. in the "
+"email notifications that are sent out from this site, as a privacy measure."
+msgstr "No incluye el contenido de un mensaje/comentario/mensaje privado/etc. en las notificaciones de correo electrónico que se envían desde este sitio, como una medida de privacidad."
+
+#: mod/admin.php:994
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Deshabilitar acceso a addons listados en el menú de aplicaciones."
+
+#: mod/admin.php:994
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Habilitando esta opción restringe el acceso a addons en el menú de aplicaciones a usuarios identificados."
+
+#: mod/admin.php:995
+msgid "Don't embed private images in posts"
+msgstr "No agregar imágenes privados en las publicaciones"
+
+#: mod/admin.php:995
+msgid ""
+"Don't replace locally-hosted private photos in posts with an embedded copy "
+"of the image. This means that contacts who receive posts containing private "
+"photos will have to authenticate and load each image, which may take a "
+"while."
+msgstr "No reemplazar imágenes privadas guardadas localmente en el servidor con imágenes integrados en los envíos. Esto significa que contactos que reciben publicaciones tendrán que autenticarse y cargar cada imagen, lo que puede demorar."
+
+#: mod/admin.php:996
+msgid "Allow Users to set remote_self"
+msgstr "Permitir a los usuarios de definir perfiles_remotos"
+
+#: mod/admin.php:996
+msgid ""
+"With checking this, every user is allowed to mark every contact as a "
+"remote_self in the repair contact dialog. Setting this flag on a contact "
+"causes mirroring every posting of that contact in the users stream."
+msgstr "Al habilitar esta opción, cada perfil tiene el permiso de marcar cualquiera de sus contactos como un perfil_remoto. Habilitar la opción perfil_remoto para un contacto genera que todas las publicaciones  de este contacto seran re-publicado  en el muro del perfil."
+
+#: mod/admin.php:997
+msgid "Block multiple registrations"
+msgstr "Bloquear registros multiples"
+
+#: mod/admin.php:997
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Impedir que los usuarios registren cuentas adicionales para su uso como páginas."
+
+#: mod/admin.php:998
+msgid "OpenID support"
+msgstr "Soporte OpenID"
+
+#: mod/admin.php:998
+msgid "OpenID support for registration and logins."
+msgstr "Soporte OpenID para registros y accesos."
+
+#: mod/admin.php:999
+msgid "Fullname check"
+msgstr "Comprobar Nombre completo"
+
+#: mod/admin.php:999
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Fuerza a los usuarios a registrarse con un espacio entre su nombre y su apellido en el campo Nombre completo como medida anti-spam"
+
+#: mod/admin.php:1000
+msgid "UTF-8 Regular expressions"
+msgstr "Expresiones regulares UTF-8"
+
+#: mod/admin.php:1000
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Usar expresiones regulares de UTF8 en PHP"
+
+#: mod/admin.php:1001
+msgid "Community Page Style"
+msgstr "Estilo de pagina de comunidad"
+
+#: mod/admin.php:1001
+msgid ""
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
+msgstr "Tipo de pagina de comunidad a visualizar. 'Comunidad global' muestra todas las publicaciones publicas de la red abierta federada que llega a este servidor."
+
+#: mod/admin.php:1002
+msgid "Posts per user on community page"
+msgstr "Publicaciones por usuario en la pagina de comunidad"
+
+#: mod/admin.php:1002
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr "El numero máximo de publicaciones por usuario que aparecerán en la pagina de comunidad. (No valido para 'comunidad global')"
+
+#: mod/admin.php:1003
+msgid "Enable OStatus support"
+msgstr "Permitir soporte OStatus"
+
+#: mod/admin.php:1003
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Proporcionar OStatus compatibilidad integrada (StatusNet, GNU Social, Quitter etc.). Todas las comunicaciones en OStatus son publicas así que eventuales advertencias serán ocasionalmente desplegadas."
+
+#: mod/admin.php:1004
+msgid "OStatus conversation completion interval"
+msgstr "Intervalo de actualización de conversaciones OStatus"
+
+#: mod/admin.php:1004
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
+msgstr "Cuan seguido el recolector deberá buscar nuevas entradas en OStatus? Esto puede ser un trabajo de mucha carga para los recursos del servidor."
+
+#: mod/admin.php:1005
+msgid "Only import OStatus threads from our contacts"
+msgstr "Solo importar OStatus temas de nuestros (?) contactos."
+
+#: mod/admin.php:1005
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option"
+" we only store threads that are started by a contact that is known on our "
+"system."
+msgstr "Normalmente importamos todo el contenido de los contactos de OStatus. Con esta opción solamente se guardan temas que fueron iniciados por contactos que son conocidos de la instancia.\n(nota de traducción, no se entiende muy bien la función en base al texto original)"
+
+#: mod/admin.php:1006
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr "Solo se puede habilitar el soporte OStatus  si threading (comentarios en fila) se encuentra habilitado."
+
+#: mod/admin.php:1008
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub"
+" directory."
+msgstr "El soporte para Diaspora* no se puede habilitar porque friendica se instalo en un directorio subalterno (sub directory)."
+
+#: mod/admin.php:1009
+msgid "Enable Diaspora support"
+msgstr "Habilitar el soporte para Diaspora*"
+
+#: mod/admin.php:1009
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Provee una compatibilidad con la red de Diaspora."
+
+#: mod/admin.php:1010
+msgid "Only allow Friendica contacts"
+msgstr "Permitir solo contactos de Friendica"
+
+#: mod/admin.php:1010
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Todos los contactos deben usar protocolos de Friendica. El resto de protocolos serán desactivados."
+
+#: mod/admin.php:1011
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: mod/admin.php:1011
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Si quieres puedes activar la comprobación estricta de certificados. Esto significa que serás incapaz de conectar con ningún sitio que use certificados SSL autofirmados."
+
+#: mod/admin.php:1012
+msgid "Proxy user"
+msgstr "Usuario proxy"
+
+#: mod/admin.php:1013
+msgid "Proxy URL"
+msgstr "Dirección proxy"
+
+#: mod/admin.php:1014
+msgid "Network timeout"
+msgstr "Tiempo de espera de red"
+
+#: mod/admin.php:1014
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segundos. Usar 0 para dejarlo sin límites (no se recomienda)."
+
+#: mod/admin.php:1015
+msgid "Delivery interval"
+msgstr "Intervalo de actualización"
+
+#: mod/admin.php:1015
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr "Retrasar la entrega de procesos en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendamos: 4-5 para los servidores compartidos, 2-3 para servidores privados virtuales, 0-1 para los grandes servidores dedicados."
+
+#: mod/admin.php:1016
+msgid "Poll interval"
+msgstr "Intervalo de sondeo"
+
+#: mod/admin.php:1016
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Retrasar los procesos en segundo plano de sondeo en esta cantidad de segundos para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega."
+
+#: mod/admin.php:1017
+msgid "Maximum Load Average"
+msgstr "Promedio de carga máxima"
+
+#: mod/admin.php:1017
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Carga máxima del sistema antes de que la entrega y los procesos de sondeo sean retrasados - por defecto 50."
+
+#: mod/admin.php:1018
+msgid "Maximum Load Average (Frontend)"
+msgstr "Carga máxima promedio (frontend)"
+
+#: mod/admin.php:1018
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Carga máxima del sistema antes de que el frontend cancele el servicio - por defecto 50."
+
+#: mod/admin.php:1019
+msgid "Maximum table size for optimization"
+msgstr "Tamaño máximo de las tablas para la optimización."
+
+#: mod/admin.php:1019
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
+msgstr "Tamaño máximo de tablas (en MB) para la optimización automática - por defecto 100MB. Ingrese -1 para deshabilitar."
+
+#: mod/admin.php:1020
+msgid "Minimum level of fragmentation"
+msgstr "Nivel mínimo de fragmentación "
+
+#: mod/admin.php:1020
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr "Nivel mínimo de fragmentación para para comenzar la optimización - valor por defecto es 30%. "
+
+#: mod/admin.php:1022
+msgid "Periodical check of global contacts"
+msgstr "Verificación periódica de los contactos globales."
+
+#: mod/admin.php:1022
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr "Habilitado los contactos globales son verificado periódicamente  por datos faltantes o datos obsoletos como también por la vitalidad de los contactos y servidores."
+
+#: mod/admin.php:1023
+msgid "Days between requery"
+msgstr "Días entre búsquedas"
+
+#: mod/admin.php:1023
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr "Cantidad de días hasta que un servidor es consultado por sus contactos."
+
+#: mod/admin.php:1024
+msgid "Discover contacts from other servers"
+msgstr "Descubrir contactos de otros servidores"
+
+#: mod/admin.php:1024
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
+msgstr "Recoger periódicamente información sobre perfiles en otros servidores. Puede elegir entre 'usuarios': perfiles de un sistema remoto, 'contactos globales': contactos activos que son conocidos por el servidor. El fallback es para servidors redmatrix y instalaciones viejas de friendica en las que los contactos no estaban a disposición. El fallback aumenta la carga del servidor, asi que la configuración recomendada es 'usuarios, contactos globales'"
+
+#: mod/admin.php:1025
+msgid "Timeframe for fetching global contacts"
+msgstr "Intervalos de tiempo para revisar contactos globales."
+
+#: mod/admin.php:1025
+msgid ""
+"When the discovery is activated, this value defines the timeframe for the "
+"activity of the global contacts that are fetched from other servers."
+msgstr "Cuando la revisacion es activada, este valor define el intervalo de tiempo de la actividad de los contactos globales que son recolectados de los servidores. (?)"
+
+#: mod/admin.php:1026
+msgid "Search the local directory"
+msgstr "Buscar el directorio local"
+
+#: mod/admin.php:1026
+msgid ""
+"Search the local directory instead of the global directory. When searching "
+"locally, every search will be executed on the global directory in the "
+"background. This improves the search results when the search is repeated."
+msgstr "Buscar en el directorio local en vez del directorio global. Cuando se busca localmente, cada busqueda sera efectuada en el directorio global en el background. Esto mejora los resultados de la busqueda cuando la misma es repetida."
+
+#: mod/admin.php:1028
+msgid "Publish server information"
+msgstr "Publicar información del servidor"
+
+#: mod/admin.php:1028
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a"
+" href='http://the-federation.info/'>the-federation.info</a> for details."
+msgstr "Si habilitado, datos generales del servidor y estadisticas de uso serán publicados. Los datos contienen el nombre y la versión del servidor, numero de usuarios con perfiles públicos, cantidad de temas publicados y los protocolos y conectores activados. Vea <a href='http://the-federation.info/'>the-federation.info</a> por detalles."
+
+#: mod/admin.php:1030
+msgid "Use MySQL full text engine"
+msgstr "Usar motor MySQL de texto completo"
+
+#: mod/admin.php:1030
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr "Activa el motor de texto completo. Agiliza las búsquedas, pero solo busca cuatro o más caracteres."
+
+#: mod/admin.php:1031
+msgid "Suppress Language"
+msgstr "Suprimir idiomas"
+
+#: mod/admin.php:1031
+msgid "Suppress language information in meta information about a posting."
+msgstr "Suprimir la información de datos meta sobre informaciones de idiomas en las publicaciones."
+
+#: mod/admin.php:1032
+msgid "Suppress Tags"
+msgstr "Suprimir tags"
+
+#: mod/admin.php:1032
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr "Suprimir la lista de tags al final de una publicación."
+
+#: mod/admin.php:1033
+msgid "Path to item cache"
+msgstr "Ruta a la caché del objeto"
+
+#: mod/admin.php:1033
+msgid "The item caches buffers generated bbcode and external images."
+msgstr "El buffer de cache de items generado para bbcodes e imágenes externas. "
+
+#: mod/admin.php:1034
+msgid "Cache duration in seconds"
+msgstr "Duración de la caché en segundos"
+
+#: mod/admin.php:1034
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day). To disable the item cache, set the value to -1."
+msgstr "¿Por cuanto tiempo deberían los archives ser almacenados en el cache? Valor por defecto 86400 segundos (un día). Para deshabilita el item cache, ajuste el valor a -1."
+
+#: mod/admin.php:1035
+msgid "Maximum numbers of comments per post"
+msgstr "Numero máximo de respuestas por tema"
+
+#: mod/admin.php:1035
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr "¿Cuantos comentarios deberían ser mostrados por tema? Valor por defecto es 100."
+
+#: mod/admin.php:1036
+msgid "Path for lock file"
+msgstr "Ruta al archivo protegido"
+
+#: mod/admin.php:1036
+msgid ""
+"The lock file is used to avoid multiple pollers at one time. Only define a "
+"folder here."
+msgstr "El archivo lock es usado para evitar multiples pooler (recolectores de información) a la vez. Defina solo una carpeta aquí."
+
+#: mod/admin.php:1037
+msgid "Temp path"
+msgstr "Ruta a los temporales"
+
+#: mod/admin.php:1037
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr "Si tiene un sistema restringido en donde el servidor web no puede acceder la dirección del sistema temp, ingrese una dirección alternativa aquí. "
+
+#: mod/admin.php:1038
+msgid "Base path to installation"
+msgstr "Ruta base para la instalación"
+
+#: mod/admin.php:1038
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the"
+" correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
+msgstr "Si el sistema no puede detectar el acceso correcto a la instalación, ingrese la dirección correcta aquí. Esta configuración solo debería utilizarse si si usa un sistema restringido y enlaces simbolicos a su webroot."
+
+#: mod/admin.php:1039
+msgid "Disable picture proxy"
+msgstr "Deshabilitar proxy de imagen"
+
+#: mod/admin.php:1039
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on"
+" systems with very low bandwith."
+msgstr "El proxy de imagen mejora el performance y privacidad. No debería ser usado en sistemas con poco ancho de banda."
+
+#: mod/admin.php:1040
+msgid "Enable old style pager"
+msgstr "Habilitar paginación estilo viejo"
+
+#: mod/admin.php:1040
+msgid ""
+"The old style pager has page numbers but slows down massively the page "
+"speed."
+msgstr "La paginación al estilo viejo tiene números de paginas pero enlentece masivamente la velocidad de la pagina."
+
+#: mod/admin.php:1041
+msgid "Only search in tags"
+msgstr "Solo buscar en tags"
+
+#: mod/admin.php:1041
+msgid "On large systems the text search can slow down the system extremely."
+msgstr "En sistemas grandes, la búsqueda de texto puede enlentecer el sistema gravemente."
+
+#: mod/admin.php:1043
+msgid "New base url"
+msgstr "Nueva URLbase"
+
+#: mod/admin.php:1043
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts"
+" of all users."
+msgstr "Cambiar base URL para este servidor. Envía mensajes de relocalisación a todos los contactos DFRN."
+
+#: mod/admin.php:1045
+msgid "RINO Encryption"
+msgstr "Encryptado RINO"
+
+#: mod/admin.php:1045
+msgid "Encryption layer between nodes."
+msgstr "Capa de encryptación entre nodos."
+
+#: mod/admin.php:1046
+msgid "Embedly API key"
+msgstr "Embedly llave de API (API key) "
+
+#: mod/admin.php:1046
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
+msgstr "<a href='http://embed.ly'>Embedly</a> es usado para recolectar datos adicionales para paginas web. Esto es un parámetro opcional."
+
+#: mod/admin.php:1048
+msgid "Enable 'worker' background processing"
+msgstr "Habilitar procesos de fondo del \"trabajador\""
+
+#: mod/admin.php:1048
+msgid ""
+"The worker background processing limits the number of parallel background "
+"jobs to a maximum number and respects the system load."
+msgstr "Limita los procesos del trabajo de fondo del numero paralelo de trabajos a un numero máximo que respeta la carga del sistema."
+
+#: mod/admin.php:1049
+msgid "Maximum number of parallel workers"
+msgstr "Numero máximo de trabajos paralelos de fondo."
+
+#: mod/admin.php:1049
+msgid ""
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
+msgstr "Ajustar a 2 en un servidor compartido (shared hosting).\nEn sistemas grandes valores como 10 son excelentes.\nValor por defecto es 4."
+
+#: mod/admin.php:1050
+msgid "Don't use 'proc_open' with the worker"
+msgstr "No use 'proc_open' junto al \"trabajador\"!"
+
+#: mod/admin.php:1050
+msgid ""
+"Enable this if your system doesn't allow the use of 'proc_open'. This can "
+"happen on shared hosters. If this is enabled you should increase the "
+"frequency of poller calls in your crontab."
+msgstr "Habilite esta función si el sistema no permite el uso de 'proc_open'. Esto suelo suceder en servidores compartidos (shared hosting). Si esta función se habilita se debería incrementar la frecuencia de llamadas del poller (poller calls) en la pestaña de trabajos cron. (¡en el hosting?)"
+
+#: mod/admin.php:1051
+msgid "Enable fastlane"
+msgstr "Habilitar ascenso rápido"
+
+#: mod/admin.php:1051
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes"
+" with higher priority are blocked by processes of lower priority."
+msgstr "Cuando está habilitado, el mecanismo ascenso rápido inicia un trabajador adicional si los procesos de mayor prioridad son bloqueados por prcesos de menor prioridad."
+
+#: mod/admin.php:1080
+msgid "Update has been marked successful"
+msgstr "La actualización se ha completado con éxito"
+
+#: mod/admin.php:1088
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr "Actualización de base de datos %s fue aplicada con éxito."
+
+#: mod/admin.php:1091
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr "El paso de actualización de la estructura de la base de datos %s fallo con el mensaje de error: %s"
+
+#: mod/admin.php:1103
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Paso %s fallo con el error: %s"
+
+#: mod/admin.php:1106
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Actualización %s aplicada con éxito."
+
+#: mod/admin.php:1110
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "La actualización %s no ha informado, se desconoce el estado."
+
+#: mod/admin.php:1112
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr "No había función adicional de actualización %s que necesitaba ser requerida."
+
+#: mod/admin.php:1131
+msgid "No failed updates."
+msgstr "Actualizaciones sin fallos."
+
+#: mod/admin.php:1132
+msgid "Check database structure"
+msgstr "Revisar estructura de la base de datos"
+
+#: mod/admin.php:1137
+msgid "Failed Updates"
+msgstr "Actualizaciones fallidas"
+
+#: mod/admin.php:1138
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "No se incluyen las anteriores a la 1139, que no indicaban su estado."
+
+#: mod/admin.php:1139
+msgid "Mark success (if update was manually applied)"
+msgstr "Marcar como correcta (si actualizaste manualmente)"
+
+#: mod/admin.php:1140
+msgid "Attempt to execute this update step automatically"
+msgstr "Intentando ejecutar este paso automáticamente"
+
+#: mod/admin.php:1174
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr "\n\t\t\tEstimado %1$s,\n\t\t\t\tel administrador de %2$s ha creado una cuenta para usted."
+
+#: mod/admin.php:1177
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%1$s\n\t\t\tNombre de la cuenta:\t\t%2$s\n\t\t\tContraseña:\t\t%3$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %4$s."
+
+#: mod/admin.php:1221
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuario bloqueado/desbloqueado"
+msgstr[1] "%s usuarios bloqueados/desbloqueados"
+
+#: mod/admin.php:1228
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuario eliminado"
+msgstr[1] "%s usuarios eliminados"
+
+#: mod/admin.php:1275
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuario '%s' eliminado"
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuario '%s' desbloqueado"
+
+#: mod/admin.php:1283
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Usuario '%s' bloqueado'"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Register date"
+msgstr "Fecha de registro"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last login"
+msgstr "Último acceso"
+
+#: mod/admin.php:1392 mod/admin.php:1418
+msgid "Last item"
+msgstr "Último elemento"
+
+#: mod/admin.php:1392 mod/settings.php:43
+msgid "Account"
+msgstr "Cuenta"
+
+#: mod/admin.php:1401
+msgid "Add User"
+msgstr "Agregar usuario"
+
+#: mod/admin.php:1402
+msgid "select all"
+msgstr "seleccionar todo"
+
+#: mod/admin.php:1403
+msgid "User registrations waiting for confirm"
+msgstr "Registro de usuarios esperando confirmación"
+
+#: mod/admin.php:1404
+msgid "User waiting for permanent deletion"
+msgstr "Usuario esperando anulación permanente."
+
+#: mod/admin.php:1405
+msgid "Request date"
+msgstr "Solicitud de fecha"
+
+#: mod/admin.php:1406
+msgid "No registrations."
+msgstr "Sin registros."
+
+#: mod/admin.php:1407
+msgid "Note from the user"
+msgstr "Nota para el usuario"
+
+#: mod/admin.php:1409
+msgid "Deny"
+msgstr "Denegado"
+
+#: mod/admin.php:1413
+msgid "Site admin"
+msgstr "Administrador de la web"
+
+#: mod/admin.php:1414
+msgid "Account expired"
+msgstr "Cuenta caducada"
+
+#: mod/admin.php:1417
+msgid "New User"
+msgstr "Nuevo usuario"
+
+#: mod/admin.php:1418
+msgid "Deleted since"
+msgstr "Borrado desde"
+
+#: mod/admin.php:1423
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "¡Los usuarios seleccionados serán eliminados!\\n\\n¡Todo lo que hayan publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: mod/admin.php:1424
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "¡El usuario {0} será eliminado!\\n\\n¡Todo lo que haya publicado en este sitio se borrará para siempre!\\n\\n¿Estás seguro?"
+
+#: mod/admin.php:1434
+msgid "Name of the new user."
+msgstr "Nombre del nuevo usuario"
+
+#: mod/admin.php:1435
+msgid "Nickname"
+msgstr "Apodo"
+
+#: mod/admin.php:1435
+msgid "Nickname of the new user."
+msgstr "Apodo del nuevo perfil."
+
+#: mod/admin.php:1436
+msgid "Email address of the new user."
+msgstr "Dirección de correo del nuevo perfil."
+
+#: mod/admin.php:1479
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Módulo %s deshabilitado."
+
+#: mod/admin.php:1483
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Módulo %s habilitado."
+
+#: mod/admin.php:1494 mod/admin.php:1730
+msgid "Disable"
+msgstr "Desactivado"
+
+#: mod/admin.php:1496 mod/admin.php:1732
+msgid "Enable"
+msgstr "Activado"
+
+#: mod/admin.php:1519 mod/admin.php:1777
+msgid "Toggle"
+msgstr "Activar"
+
+#: mod/admin.php:1527 mod/admin.php:1786
+msgid "Author: "
+msgstr "Autor:"
+
+#: mod/admin.php:1528 mod/admin.php:1787
+msgid "Maintainer: "
+msgstr "Mantenedor: "
+
+#: mod/admin.php:1580
+msgid "Reload active plugins"
+msgstr "Recargar plugins activos"
+
+#: mod/admin.php:1585
+#, php-format
+msgid ""
+"There are currently no plugins available on your node. You can find the "
+"official plugin repository at %1$s and might find other interesting plugins "
+"in the open plugin registry at %2$s"
+msgstr "No ay plugins habilitados en este nodo. Encontrara los repositorios oficiales de plugins en %1$s y posiblemente encontrara mas plugins interesantes en el registro abierto de plugins aquí %2$s ."
+
+#: mod/admin.php:1690
+msgid "No themes found."
+msgstr "No se encontraron temas."
+
+#: mod/admin.php:1768
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: mod/admin.php:1828
+msgid "Reload active themes"
+msgstr "Recargar interfaces de usuario activos"
+
+#: mod/admin.php:1833
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
+msgstr "No se encuentran interfaces en el sistema. Deberían estar localizados (paced) en  %1$s"
+
+#: mod/admin.php:1834
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: mod/admin.php:1835
+msgid "[Unsupported]"
+msgstr "[Sin soporte]"
+
+#: mod/admin.php:1859
+msgid "Log settings updated."
+msgstr "Configuración de registro actualizada."
+
+#: mod/admin.php:1891
+msgid "PHP log currently enabled."
+msgstr "Registro PHP actualmente disponible."
+
+#: mod/admin.php:1893
+msgid "PHP log currently disabled."
+msgstr "Registro PHP actualmente deshabilitado."
+
+#: mod/admin.php:1902
+msgid "Clear"
+msgstr "Limpiar"
+
+#: mod/admin.php:1907
+msgid "Enable Debugging"
+msgstr "Habilitar debugging"
+
+#: mod/admin.php:1908
+msgid "Log file"
+msgstr "Archivo de registro"
+
+#: mod/admin.php:1908
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Debes tener permiso de escritura en el servidor. Relacionado con tu directorio de inicio de Friendica."
+
+#: mod/admin.php:1909
+msgid "Log level"
+msgstr "Nivel de registro"
+
+#: mod/admin.php:1912
+msgid "PHP logging"
+msgstr "PHP logging"
+
+#: mod/admin.php:1913
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
+msgstr "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo."
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "Off"
+msgstr "Apagado"
+
+#: mod/admin.php:2040 mod/admin.php:2041 mod/settings.php:778
+msgid "On"
+msgstr "Encendido"
+
+#: mod/admin.php:2041
+#, php-format
+msgid "Lock feature %s"
+msgstr "Trancar opción %s "
+
+#: mod/admin.php:2049
+msgid "Manage Additional Features"
+msgstr "Administrar opciones adicionales"
+
+#: mod/item.php:116
+msgid "Unable to locate original post."
+msgstr "No se puede encontrar la publicación original."
+
+#: mod/item.php:340
+msgid "Empty post discarded."
+msgstr "Publicación vacía descartada."
+
+#: mod/item.php:898
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Mensaje no guardado."
+
+#: mod/item.php:988
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Este mensaje te lo ha enviado %s, miembro de la red social Friendica."
+
+#: mod/item.php:990
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Los puedes visitar en línea en %s"
+
+#: mod/item.php:991
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."
+
+#: mod/item.php:995
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicado una actualización."
+
 #: mod/network.php:398
 #, php-format
-msgid "Warning: This group contains %s member from an insecure network."
+msgid ""
+"Warning: This group contains %s member from a network that doesn't allow non"
+" public messages."
 msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] "Aviso: este grupo contiene %s contacto con conexión no segura."
-msgstr[1] "Aviso: este grupo contiene %s contactos con conexiones no seguras."
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos."
+msgstr[1] "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos."
 
 #: mod/network.php:401
-msgid "Private messages to this group are at risk of public disclosure."
-msgstr "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente."
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Los mensajes de este grupo no se enviarán a estos receptores."
 
-#: mod/network.php:528
+#: mod/network.php:529
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."
 
-#: mod/network.php:533
+#: mod/network.php:534
 msgid "Invalid contact."
 msgstr "Contacto erróneo."
 
-#: mod/network.php:826
+#: mod/network.php:827
 msgid "Commented Order"
 msgstr "Orden de comentarios"
 
-#: mod/network.php:829
+#: mod/network.php:830
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentarios"
 
-#: mod/network.php:834
+#: mod/network.php:835
 msgid "Posted Order"
 msgstr "Orden de publicación"
 
-#: mod/network.php:837
+#: mod/network.php:838
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: mod/network.php:848
+#: mod/network.php:849
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que te mencionan o involucran"
 
-#: mod/network.php:856
+#: mod/network.php:857
 msgid "New"
 msgstr "Nuevo"
 
-#: mod/network.php:859
+#: mod/network.php:860
 msgid "Activity Stream - by date"
 msgstr "Corriente de actividad por fecha"
 
-#: mod/network.php:867
+#: mod/network.php:868
 msgid "Shared Links"
 msgstr "Enlaces compartidos"
 
-#: mod/network.php:870
+#: mod/network.php:871
 msgid "Interesting Links"
 msgstr "Enlaces interesantes"
 
-#: mod/network.php:878
+#: mod/network.php:879
 msgid "Starred"
 msgstr "Favoritos"
 
-#: mod/network.php:881
+#: mod/network.php:882
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
@@ -7667,11 +7691,11 @@ msgstr "o nombre de un álbum existente: "
 msgid "Do not show a status post for this upload"
 msgstr "No actualizar tu estado con este envío"
 
-#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1295
+#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1300
 msgid "Show to Groups"
 msgstr "Mostrar a los Grupos"
 
-#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1296
+#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1301
 msgid "Show to Contacts"
 msgstr "Mostrar a los Contactos"
 
@@ -7776,22 +7800,18 @@ msgstr "Mapa"
 msgid "View Album"
 msgstr "Ver Álbum"
 
-#: mod/ping.php:234
+#: mod/ping.php:211
 msgid "{0} wants to be your friend"
 msgstr "{0} quiere ser tu amigo"
 
-#: mod/ping.php:249
+#: mod/ping.php:226
 msgid "{0} sent you a message"
 msgstr "{0} te ha enviado un mensaje"
 
-#: mod/ping.php:264
+#: mod/ping.php:241
 msgid "{0} requested registration"
 msgstr "{0} solicitudes de registro"
 
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr "Consejos para nuevos miembros"
-
 #: mod/register.php:93
 msgid ""
 "Registration successful. Please check your email for further instructions."
@@ -7812,121 +7832,86 @@ msgstr "Registro exitoso."
 msgid "Your registration can not be processed."
 msgstr "Tu registro no se puede procesar."
 
-#: mod/register.php:153
+#: mod/register.php:160
 msgid "Your registration is pending approval by the site owner."
 msgstr "Tu registro está pendiente de aprobación por el propietario del sitio."
 
-#: mod/register.php:219
+#: mod/register.php:226
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"."
 
-#: mod/register.php:220
+#: mod/register.php:227
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos."
 
-#: mod/register.php:221
+#: mod/register.php:228
 msgid "Your OpenID (optional): "
 msgstr "Tu OpenID (opcional):"
 
-#: mod/register.php:235
+#: mod/register.php:242
 msgid "Include your profile in member directory?"
 msgstr "¿Incluir tu perfil en el directorio de miembros?"
 
-#: mod/register.php:259
+#: mod/register.php:267
+msgid "Note for the admin"
+msgstr "Nota para el administrador"
+
+#: mod/register.php:267
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo"
+
+#: mod/register.php:268
 msgid "Membership on this site is by invitation only."
 msgstr "Sitio solo accesible mediante invitación."
 
-#: mod/register.php:260
+#: mod/register.php:269
 msgid "Your invitation ID: "
 msgstr "ID de tu invitación: "
 
-#: mod/register.php:271
+#: mod/register.php:280
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr "Nombre completo (ej. Joe Smith, real o real aparente):"
 
-#: mod/register.php:272
+#: mod/register.php:281
 msgid "Your Email Address: "
 msgstr "Tu dirección de correo: "
 
-#: mod/register.php:274 mod/settings.php:1266
+#: mod/register.php:283 mod/settings.php:1271
 msgid "New Password:"
 msgstr "Contraseña nueva:"
 
-#: mod/register.php:274
+#: mod/register.php:283
 msgid "Leave empty for an auto generated password."
 msgstr "Dejar vacío para autogenerar una contraseña"
 
-#: mod/register.php:275 mod/settings.php:1267
+#: mod/register.php:284 mod/settings.php:1272
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: mod/register.php:276
+#: mod/register.php:285
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@$nombredelsitio</strong>\"."
 
-#: mod/register.php:277
+#: mod/register.php:286
 msgid "Choose a nickname: "
 msgstr "Escoge un apodo: "
 
-#: mod/register.php:287
+#: mod/register.php:296
 msgid "Import your profile to this friendica instance"
 msgstr "Importar tu perfil a esta instancia de friendica"
 
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr "¿Estás seguro de que quieres borrar esta sugerencia?"
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignorar/Ocultar"
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr "[Contenido incrustado - recarga la página para verlo]"
-
-#: mod/videos.php:120
-msgid "Do you really want to delete this video?"
-msgstr "Realmente quieres eliminar este vídeo?"
-
-#: mod/videos.php:125
-msgid "Delete Video"
-msgstr "Borrar vídeo"
-
-#: mod/videos.php:204
-msgid "No videos selected"
-msgstr "Ningún vídeo seleccionado"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Vídeos recientes"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Subir nuevos vídeos"
-
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr "Ningún contacto."
-
 #: mod/settings.php:60
 msgid "Display"
 msgstr "Interfaz del usuario"
 
-#: mod/settings.php:67 mod/settings.php:884
+#: mod/settings.php:67 mod/settings.php:886
 msgid "Social Networks"
 msgstr "Redes sociales"
 
@@ -7954,675 +7939,731 @@ msgstr "Configuración de correo actualizada."
 msgid "Features updated"
 msgstr "Actualizaciones"
 
-#: mod/settings.php:357
+#: mod/settings.php:359
 msgid "Relocate message has been send to your contacts"
 msgstr "Mensaje de reubicación ha sido enviado a sus contactos."
 
-#: mod/settings.php:376
+#: mod/settings.php:378
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "No se permiten contraseñas vacías. La contraseña no ha sido modificada."
 
-#: mod/settings.php:384
+#: mod/settings.php:386
 msgid "Wrong password."
 msgstr "Contraseña incorrecta"
 
-#: mod/settings.php:395
+#: mod/settings.php:397
 msgid "Password changed."
 msgstr "Contraseña modificada."
 
-#: mod/settings.php:397
+#: mod/settings.php:399
 msgid "Password update failed. Please try again."
 msgstr "La actualización de la contraseña ha fallado. Por favor, prueba otra vez."
 
-#: mod/settings.php:477
+#: mod/settings.php:479
 msgid " Please use a shorter name."
 msgstr " Usa un nombre más corto."
 
-#: mod/settings.php:479
+#: mod/settings.php:481
 msgid " Name too short."
 msgstr " Nombre demasiado corto."
 
-#: mod/settings.php:488
+#: mod/settings.php:490
 msgid "Wrong Password"
 msgstr "Contraseña incorrecta"
 
-#: mod/settings.php:493
+#: mod/settings.php:495
 msgid " Not valid email."
 msgstr " Correo no válido."
 
-#: mod/settings.php:499
+#: mod/settings.php:501
 msgid " Cannot change to that email."
 msgstr " No se puede usar ese correo."
 
-#: mod/settings.php:555
+#: mod/settings.php:557
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto."
 
-#: mod/settings.php:559
+#: mod/settings.php:561
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad."
 
-#: mod/settings.php:599
+#: mod/settings.php:601
 msgid "Settings updated."
 msgstr "Configuración actualizada."
 
-#: mod/settings.php:675 mod/settings.php:701 mod/settings.php:737
+#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
 msgid "Add application"
 msgstr "Agregar aplicación"
 
-#: mod/settings.php:679 mod/settings.php:705
+#: mod/settings.php:681 mod/settings.php:707
 msgid "Consumer Key"
 msgstr "Clave del consumidor"
 
-#: mod/settings.php:680 mod/settings.php:706
+#: mod/settings.php:682 mod/settings.php:708
 msgid "Consumer Secret"
 msgstr "Secreto del consumidor"
 
-#: mod/settings.php:681 mod/settings.php:707
+#: mod/settings.php:683 mod/settings.php:709
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: mod/settings.php:682 mod/settings.php:708
+#: mod/settings.php:684 mod/settings.php:710
 msgid "Icon url"
 msgstr "Dirección del ícono"
 
-#: mod/settings.php:693
+#: mod/settings.php:695
 msgid "You can't edit this application."
 msgstr "No puedes editar esta aplicación."
 
-#: mod/settings.php:736
+#: mod/settings.php:738
 msgid "Connected Apps"
 msgstr "Aplicaciones conectadas"
 
-#: mod/settings.php:740
+#: mod/settings.php:742
 msgid "Client key starts with"
 msgstr "Clave de cliente comienza por"
 
-#: mod/settings.php:741
+#: mod/settings.php:743
 msgid "No name"
 msgstr "Sin nombre"
 
-#: mod/settings.php:742
+#: mod/settings.php:744
 msgid "Remove authorization"
 msgstr "Suprimir la autorización"
 
-#: mod/settings.php:754
+#: mod/settings.php:756
 msgid "No Plugin settings configured"
 msgstr "No se ha configurado ningún módulo"
 
-#: mod/settings.php:762
+#: mod/settings.php:764
 msgid "Plugin Settings"
 msgstr "Configuración de los módulos"
 
-#: mod/settings.php:784
+#: mod/settings.php:786
 msgid "Additional Features"
 msgstr "Características adicionales"
 
-#: mod/settings.php:794 mod/settings.php:798
+#: mod/settings.php:796 mod/settings.php:800
 msgid "General Social Media Settings"
 msgstr "Configuración general de social media "
 
-#: mod/settings.php:804
+#: mod/settings.php:806
 msgid "Disable intelligent shortening"
 msgstr "Deshabilitar recorte inteligente de URL"
 
-#: mod/settings.php:806
+#: mod/settings.php:808
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the"
 " original friendica post."
 msgstr "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica."
 
-#: mod/settings.php:812
+#: mod/settings.php:814
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones "
 
-#: mod/settings.php:814
+#: mod/settings.php:816
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario."
 
-#: mod/settings.php:820
+#: mod/settings.php:822
 msgid "Default group for OStatus contacts"
 msgstr "Grupo por defecto para contactos OStatus"
 
-#: mod/settings.php:826
+#: mod/settings.php:828
 msgid "Your legacy GNU Social account"
 msgstr "Tu cuenta GNU social conectada"
 
-#: mod/settings.php:828
+#: mod/settings.php:830
 msgid ""
 "If you enter your old GNU Social/Statusnet account name here (in the format "
 "user@domain.tld), your contacts will be added automatically. The field will "
 "be emptied when done."
 msgstr "Si agrega su viejo nombre de perfil  GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. "
 
-#: mod/settings.php:831
+#: mod/settings.php:833
 msgid "Repair OStatus subscriptions"
 msgstr "Reparar subscripciones de OStatus"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "El soporte integrado de conexión con %s está %s"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "enabled"
 msgstr "habilitado"
 
-#: mod/settings.php:840 mod/settings.php:841
+#: mod/settings.php:842 mod/settings.php:843
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: mod/settings.php:841
+#: mod/settings.php:843
 msgid "GNU Social (OStatus)"
 msgstr "GNUsocial (OStatus)"
 
-#: mod/settings.php:877
+#: mod/settings.php:879
 msgid "Email access is disabled on this site."
 msgstr "El acceso por correo está deshabilitado en esta web."
 
-#: mod/settings.php:889
+#: mod/settings.php:891
 msgid "Email/Mailbox Setup"
 msgstr "Configuración del correo/buzón"
 
-#: mod/settings.php:890
+#: mod/settings.php:892
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón."
 
-#: mod/settings.php:891
+#: mod/settings.php:893
 msgid "Last successful email check:"
 msgstr "Última comprobación del correo con éxito:"
 
-#: mod/settings.php:893
+#: mod/settings.php:895
 msgid "IMAP server name:"
 msgstr "Nombre del servidor IMAP:"
 
-#: mod/settings.php:894
+#: mod/settings.php:896
 msgid "IMAP port:"
 msgstr "Puerto IMAP:"
 
-#: mod/settings.php:895
+#: mod/settings.php:897
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: mod/settings.php:895 mod/settings.php:900
+#: mod/settings.php:897 mod/settings.php:902
 msgid "None"
 msgstr "Ninguna"
 
-#: mod/settings.php:896
+#: mod/settings.php:898
 msgid "Email login name:"
 msgstr "Nombre de usuario:"
 
-#: mod/settings.php:897
+#: mod/settings.php:899
 msgid "Email password:"
 msgstr "Contraseña:"
 
-#: mod/settings.php:898
+#: mod/settings.php:900
 msgid "Reply-to address:"
 msgstr "Dirección de respuesta:"
 
-#: mod/settings.php:899
+#: mod/settings.php:901
 msgid "Send public posts to all email contacts:"
 msgstr "Enviar publicaciones públicas a todos los contactos de correo:"
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Action after import:"
 msgstr "Acción después de importar:"
 
-#: mod/settings.php:900
+#: mod/settings.php:902
 msgid "Move to folder"
 msgstr "Mover a un directorio"
 
-#: mod/settings.php:901
+#: mod/settings.php:903
 msgid "Move to folder:"
 msgstr "Mover al directorio:"
 
-#: mod/settings.php:990
+#: mod/settings.php:994
 msgid "Display Settings"
 msgstr "Configuración Tema/Visualización"
 
-#: mod/settings.php:996 mod/settings.php:1018
+#: mod/settings.php:1000 mod/settings.php:1023
 msgid "Display Theme:"
 msgstr "Utilizar tema:"
 
-#: mod/settings.php:997
+#: mod/settings.php:1001
 msgid "Mobile Theme:"
 msgstr "Tema móvil:"
 
-#: mod/settings.php:998
+#: mod/settings.php:1002
+msgid "Suppress warning of insecure networks"
+msgstr "Suprimir el aviso de redes inseguras"
+
+#: mod/settings.php:1002
+msgid ""
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
+msgstr "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas."
+
+#: mod/settings.php:1003
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: mod/settings.php:998
+#: mod/settings.php:1003
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimo 10 segundos. Ingrese -1 para deshabilitar."
 
-#: mod/settings.php:999
+#: mod/settings.php:1004
 msgid "Number of items to display per page:"
 msgstr "Número de elementos a mostrar por página:"
 
-#: mod/settings.php:999 mod/settings.php:1000
+#: mod/settings.php:1004 mod/settings.php:1005
 msgid "Maximum of 100 items"
 msgstr "Máximo 100 elementos"
 
-#: mod/settings.php:1000
+#: mod/settings.php:1005
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Cantidad de objetos a visualizar cuando se usa un movil"
 
-#: mod/settings.php:1001
+#: mod/settings.php:1006
 msgid "Don't show emoticons"
 msgstr "No mostrar emoticones"
 
-#: mod/settings.php:1002
+#: mod/settings.php:1007
 msgid "Calendar"
 msgstr "Calendario"
 
-#: mod/settings.php:1003
+#: mod/settings.php:1008
 msgid "Beginning of week:"
 msgstr "Principio de la semana:"
 
-#: mod/settings.php:1004
+#: mod/settings.php:1009
 msgid "Don't show notices"
 msgstr "No mostrara avisos"
 
-#: mod/settings.php:1005
+#: mod/settings.php:1010
 msgid "Infinite scroll"
 msgstr "pagina infinita (sroll)"
 
-#: mod/settings.php:1006
+#: mod/settings.php:1011
 msgid "Automatic updates only at the top of the network page"
 msgstr "Actualizaciones automaticas solo estando al principio de la pagina"
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid "Bandwith Saver Mode"
 msgstr "Modo de guardado de ancho de banda"
 
-#: mod/settings.php:1007
+#: mod/settings.php:1012
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas."
 
-#: mod/settings.php:1009
+#: mod/settings.php:1014
 msgid "General Theme Settings"
 msgstr "Ajustes generales de tema"
 
-#: mod/settings.php:1010
+#: mod/settings.php:1015
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados de tema"
 
-#: mod/settings.php:1011
+#: mod/settings.php:1016
 msgid "Content Settings"
 msgstr "Ajustes de contenido"
 
-#: mod/settings.php:1012 view/theme/frio/config.php:61
-#: view/theme/cleanzero/config.php:82 view/theme/quattro/config.php:66
-#: view/theme/dispy/config.php:72 view/theme/vier/config.php:109
-#: view/theme/diabook/config.php:150 view/theme/duepuntozero/config.php:61
+#: mod/settings.php:1017 view/theme/frio/config.php:61
+#: view/theme/quattro/config.php:66 view/theme/vier/config.php:109
+#: view/theme/duepuntozero/config.php:61
 msgid "Theme settings"
 msgstr "Configuración del Tema"
 
-#: mod/settings.php:1094
+#: mod/settings.php:1099
 msgid "Account Types"
 msgstr "Tipos de cuenta"
 
-#: mod/settings.php:1095
+#: mod/settings.php:1100
 msgid "Personal Page Subtypes"
 msgstr "Subtipos de página personal"
 
-#: mod/settings.php:1096
+#: mod/settings.php:1101
 msgid "Community Forum Subtypes"
 msgstr "Subtipos de foro de comunidad"
 
-#: mod/settings.php:1103
+#: mod/settings.php:1108
 msgid "Personal Page"
 msgstr "Página personal"
 
-#: mod/settings.php:1104
+#: mod/settings.php:1109
 msgid "This account is a regular personal profile"
 msgstr "Esta cuenta es un perfil personal corriente"
 
-#: mod/settings.php:1107
+#: mod/settings.php:1112
 msgid "Organisation Page"
 msgstr "Página de organización"
 
-#: mod/settings.php:1108
+#: mod/settings.php:1113
 msgid "This account is a profile for an organisation"
 msgstr "Esta cuenta es un perfil de una organización"
 
-#: mod/settings.php:1111
+#: mod/settings.php:1116
 msgid "News Page"
 msgstr "Página de noticias"
 
-#: mod/settings.php:1112
+#: mod/settings.php:1117
 msgid "This account is a news account/reflector"
 msgstr "Esta cuenta es una cuenta de noticias/reflectora"
 
-#: mod/settings.php:1115
+#: mod/settings.php:1120
 msgid "Community Forum"
 msgstr "Foro de la comunidad"
 
-#: mod/settings.php:1116
+#: mod/settings.php:1121
 msgid ""
 "This account is a community forum where people can discuss with each other"
 msgstr "Esta cuenta es un foro de comunidad donde la gente puede debatir con otros"
 
-#: mod/settings.php:1119
+#: mod/settings.php:1124
 msgid "Normal Account Page"
 msgstr "Página de cuenta normal"
 
-#: mod/settings.php:1120
+#: mod/settings.php:1125
 msgid "This account is a normal personal profile"
 msgstr "Esta cuenta es el perfil personal normal"
 
-#: mod/settings.php:1123
+#: mod/settings.php:1128
 msgid "Soapbox Page"
 msgstr "Página de tribuna"
 
-#: mod/settings.php:1124
+#: mod/settings.php:1129
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura"
 
-#: mod/settings.php:1127
+#: mod/settings.php:1132
 msgid "Public Forum"
 msgstr "Foro público"
 
-#: mod/settings.php:1128
+#: mod/settings.php:1133
 msgid "Automatically approve all contact requests"
 msgstr "Aprovar autimáticamente todas las solicitudes de contacto"
 
-#: mod/settings.php:1131
+#: mod/settings.php:1136
 msgid "Automatic Friend Page"
 msgstr "Página de Amistad autómatica"
 
-#: mod/settings.php:1132
+#: mod/settings.php:1137
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos"
 
-#: mod/settings.php:1135
+#: mod/settings.php:1140
 msgid "Private Forum [Experimental]"
 msgstr "Foro privado [Experimental]"
 
-#: mod/settings.php:1136
+#: mod/settings.php:1141
 msgid "Private forum - approved members only"
 msgstr "Foro privado - solo miembros"
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1148
+#: mod/settings.php:1153
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta."
 
-#: mod/settings.php:1158
+#: mod/settings.php:1163
 msgid "Publish your default profile in your local site directory?"
 msgstr "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?"
 
-#: mod/settings.php:1164
+#: mod/settings.php:1169
 msgid "Publish your default profile in the global social directory?"
 msgstr "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?"
 
-#: mod/settings.php:1172
+#: mod/settings.php:1177
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?"
 
-#: mod/settings.php:1176
+#: mod/settings.php:1181
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr "Si habilitado, enviar temas públicos a  a Diaspora* y otras redes no es posible. "
 
-#: mod/settings.php:1181
+#: mod/settings.php:1186
 msgid "Allow friends to post to your profile page?"
 msgstr "¿Permites que tus amigos publiquen en tu página de perfil?"
 
-#: mod/settings.php:1187
+#: mod/settings.php:1192
 msgid "Allow friends to tag your posts?"
 msgstr "¿Permites a los amigos etiquetar tus publicaciones?"
 
-#: mod/settings.php:1193
+#: mod/settings.php:1198
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?"
 
-#: mod/settings.php:1199
+#: mod/settings.php:1204
 msgid "Permit unknown people to send you private mail?"
 msgstr "¿Permites que desconocidos te manden correos privados?"
 
-#: mod/settings.php:1207
+#: mod/settings.php:1212
 msgid "Profile is <strong>not published</strong>."
 msgstr "El perfil <strong>no está publicado</strong>."
 
-#: mod/settings.php:1215
+#: mod/settings.php:1220
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "Su dirección de identidad es <strong>'%s'</strong> o '%s'."
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "Automatically expire posts after this many days:"
 msgstr "Las publicaciones expirarán automáticamente después de estos días:"
 
-#: mod/settings.php:1222
+#: mod/settings.php:1227
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán"
 
-#: mod/settings.php:1223
+#: mod/settings.php:1228
 msgid "Advanced expiration settings"
 msgstr "Configuración avanzada de expiración"
 
-#: mod/settings.php:1224
+#: mod/settings.php:1229
 msgid "Advanced Expiration"
 msgstr "Expiración avanzada"
 
-#: mod/settings.php:1225
+#: mod/settings.php:1230
 msgid "Expire posts:"
 msgstr "¿Expiran las publicaciones?"
 
-#: mod/settings.php:1226
+#: mod/settings.php:1231
 msgid "Expire personal notes:"
 msgstr "¿Expiran las notas personales?"
 
-#: mod/settings.php:1227
+#: mod/settings.php:1232
 msgid "Expire starred posts:"
 msgstr "¿Expiran los favoritos?"
 
-#: mod/settings.php:1228
+#: mod/settings.php:1233
 msgid "Expire photos:"
 msgstr "¿Expiran las fotografías?"
 
-#: mod/settings.php:1229
+#: mod/settings.php:1234
 msgid "Only expire posts by others:"
 msgstr "Solo expiran los mensajes de los demás:"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1262
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: mod/settings.php:1265
+#: mod/settings.php:1270
 msgid "Password Settings"
 msgstr "Configuración de la contraseña"
 
-#: mod/settings.php:1267
+#: mod/settings.php:1272
 msgid "Leave password fields blank unless changing"
 msgstr "Deja la contraseña en blanco si no quieres cambiarla"
 
-#: mod/settings.php:1268
+#: mod/settings.php:1273
 msgid "Current Password:"
 msgstr "Contraseña actual:"
 
-#: mod/settings.php:1268 mod/settings.php:1269
+#: mod/settings.php:1273 mod/settings.php:1274
 msgid "Your current password to confirm the changes"
 msgstr "Su contraseña actual para confirmar los cambios."
 
-#: mod/settings.php:1269
+#: mod/settings.php:1274
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: mod/settings.php:1273
+#: mod/settings.php:1278
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: mod/settings.php:1275
+#: mod/settings.php:1280
 msgid "Email Address:"
 msgstr "Dirección de correo:"
 
-#: mod/settings.php:1276
+#: mod/settings.php:1281
 msgid "Your Timezone:"
 msgstr "Zona horaria:"
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid "Your Language:"
 msgstr "Tu idioma:"
 
-#: mod/settings.php:1277
+#: mod/settings.php:1282
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo."
 
-#: mod/settings.php:1278
+#: mod/settings.php:1283
 msgid "Default Post Location:"
 msgstr "Localización predeterminada:"
 
-#: mod/settings.php:1279
+#: mod/settings.php:1284
 msgid "Use Browser Location:"
 msgstr "Usar localización del navegador:"
 
-#: mod/settings.php:1282
+#: mod/settings.php:1287
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: mod/settings.php:1284
+#: mod/settings.php:1289
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo número de peticiones de amistad por día:"
 
-#: mod/settings.php:1284 mod/settings.php:1314
+#: mod/settings.php:1289 mod/settings.php:1319
 msgid "(to prevent spam abuse)"
 msgstr "(para prevenir el abuso de spam)"
 
-#: mod/settings.php:1285
+#: mod/settings.php:1290
 msgid "Default Post Permissions"
 msgstr "Permisos por defecto para las publicaciones"
 
-#: mod/settings.php:1286
+#: mod/settings.php:1291
 msgid "(click to open/close)"
 msgstr "(pulsa para abrir/cerrar)"
 
-#: mod/settings.php:1297
+#: mod/settings.php:1302
 msgid "Default Private Post"
 msgstr "Publicación Privada por defecto"
 
-#: mod/settings.php:1298
+#: mod/settings.php:1303
 msgid "Default Public Post"
 msgstr "Publicación Pública por defecto"
 
-#: mod/settings.php:1302
+#: mod/settings.php:1307
 msgid "Default Permissions for New Posts"
 msgstr "Permisos por defecto para nuevas publicaciones"
 
-#: mod/settings.php:1314
+#: mod/settings.php:1319
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Número máximo de mensajes diarios para desconocidos:"
 
-#: mod/settings.php:1317
+#: mod/settings.php:1322
 msgid "Notification Settings"
 msgstr "Configuración de notificaciones"
 
-#: mod/settings.php:1318
+#: mod/settings.php:1323
 msgid "By default post a status message when:"
 msgstr "Publicar en tu estado cuando:"
 
-#: mod/settings.php:1319
+#: mod/settings.php:1324
 msgid "accepting a friend request"
 msgstr "aceptes una solicitud de amistad"
 
-#: mod/settings.php:1320
+#: mod/settings.php:1325
 msgid "joining a forum/community"
 msgstr "te unas a un foro/comunidad"
 
-#: mod/settings.php:1321
+#: mod/settings.php:1326
 msgid "making an <em>interesting</em> profile change"
 msgstr "hagas un cambio <em>interesante</em> en tu perfil"
 
-#: mod/settings.php:1322
+#: mod/settings.php:1327
 msgid "Send a notification email when:"
 msgstr "Enviar notificación por correo cuando:"
 
-#: mod/settings.php:1323
+#: mod/settings.php:1328
 msgid "You receive an introduction"
 msgstr "Recibas una presentación"
 
-#: mod/settings.php:1324
+#: mod/settings.php:1329
 msgid "Your introductions are confirmed"
 msgstr "Tu presentación sea confirmada"
 
-#: mod/settings.php:1325
+#: mod/settings.php:1330
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en el muro de mi perfil"
 
-#: mod/settings.php:1326
+#: mod/settings.php:1331
 msgid "Someone writes a followup comment"
 msgstr "Algien escriba en un comentario que sigo"
 
-#: mod/settings.php:1327
+#: mod/settings.php:1332
 msgid "You receive a private message"
 msgstr "Recibas un mensaje privado"
 
-#: mod/settings.php:1328
+#: mod/settings.php:1333
 msgid "You receive a friend suggestion"
 msgstr "Recibas una sugerencia de amistad"
 
-#: mod/settings.php:1329
+#: mod/settings.php:1334
 msgid "You are tagged in a post"
 msgstr "Seas etiquetado en una publicación"
 
-#: mod/settings.php:1330
+#: mod/settings.php:1335
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Te han tocado/empujado/etc. en una publicación"
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Activate desktop notifications"
 msgstr "Activar notificaciones en pantalla."
 
-#: mod/settings.php:1332
+#: mod/settings.php:1337
 msgid "Show desktop popup on new notifications"
 msgstr "Mostrar notificaciones emergentes en caso de nuevos eventos."
 
-#: mod/settings.php:1334
+#: mod/settings.php:1339
 msgid "Text-only notification emails"
 msgstr "Notificaciones e-mail de solo texto"
 
-#: mod/settings.php:1336
+#: mod/settings.php:1341
 msgid "Send text only notification emails, without the html part"
 msgstr "Enviar las notificaciones por correo con formato de solo texto sin html."
 
-#: mod/settings.php:1338
+#: mod/settings.php:1343
 msgid "Advanced Account/Page Type Settings"
 msgstr "Configuración avanzada de tipo de Cuenta/Página"
 
-#: mod/settings.php:1339
+#: mod/settings.php:1344
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta para situaciones especiales"
 
-#: mod/settings.php:1342
+#: mod/settings.php:1347
 msgid "Relocate"
 msgstr "Relocalizar"
 
-#: mod/settings.php:1343
+#: mod/settings.php:1348
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente  recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)"
 
-#: mod/settings.php:1344
+#: mod/settings.php:1349
 msgid "Resend relocate message to contacts"
 msgstr "Reenviar mensaje de relocalización a los contactos"
 
+#: mod/videos.php:120
+msgid "Do you really want to delete this video?"
+msgstr "Realmente quieres eliminar este vídeo?"
+
+#: mod/videos.php:125
+msgid "Delete Video"
+msgstr "Borrar vídeo"
+
+#: mod/videos.php:204
+msgid "No videos selected"
+msgstr "Ningún vídeo seleccionado"
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr "Vídeos recientes"
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr "Subir nuevos vídeos"
+
+#: mod/viewcontacts.php:72
+msgid "No contacts."
+msgstr "Ningún contacto."
+
+#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
+#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
+#: mod/wall_upload.php:122 mod/wall_upload.php:125
+msgid "Invalid request."
+msgstr "Consulta invalida"
+
+#: mod/wall_attach.php:94
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite."
+
+#: mod/wall_attach.php:94
+msgid "Or - did you try to upload an empty file?"
+msgstr "Si no - intento de subir un archivo vacío?"
+
+#: mod/wall_attach.php:105
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "El archivo excede el limite de tamaño de %s"
+
+#: mod/wall_attach.php:156 mod/wall_attach.php:172
+msgid "File upload failed."
+msgstr "Ha fallado la subida del archivo."
+
 #: object/Item.php:370
 msgid "via"
 msgstr "vía"
@@ -8707,23 +8748,6 @@ msgstr "Invitado"
 msgid "Visitor"
 msgstr "Visitante"
 
-#: view/theme/cleanzero/config.php:83
-msgid "Set resize level for images in posts and comments (width and height)"
-msgstr "Configurar el tamaño de las imágenes en las publicaciones"
-
-#: view/theme/cleanzero/config.php:84 view/theme/dispy/config.php:73
-#: view/theme/diabook/config.php:151
-msgid "Set font-size for posts and comments"
-msgstr "Tamaño del texto para publicaciones y comentarios"
-
-#: view/theme/cleanzero/config.php:85
-msgid "Set theme width"
-msgstr "Establecer el ancho para el tema"
-
-#: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr "Esquema de color"
-
 #: view/theme/quattro/config.php:67
 msgid "Alignment"
 msgstr "Alineación"
@@ -8736,6 +8760,10 @@ msgstr "Izquierda"
 msgid "Center"
 msgstr "Centrado"
 
+#: view/theme/quattro/config.php:68
+msgid "Color scheme"
+msgstr "Esquema de color"
+
 #: view/theme/quattro/config.php:69
 msgid "Posts font size"
 msgstr "Tamaño de letra del titulo de las publicaciones"
@@ -8744,33 +8772,19 @@ msgstr "Tamaño de letra del titulo de las publicaciones"
 msgid "Textareas font size"
 msgstr "Tamaño de letra del área de texto"
 
-#: view/theme/dispy/config.php:74 view/theme/diabook/config.php:152
-msgid "Set line-height for posts and comments"
-msgstr "Altura para las publicaciones y comentarios"
-
-#: view/theme/dispy/config.php:75
-msgid "Set colour scheme"
-msgstr "Configurar esquema de color"
-
 #: view/theme/vier/theme.php:152 view/theme/vier/config.php:112
-#: view/theme/diabook/theme.php:391 view/theme/diabook/theme.php:626
-#: view/theme/diabook/config.php:160
 msgid "Community Profiles"
 msgstr "Perfiles de la Comunidad"
 
 #: view/theme/vier/theme.php:181 view/theme/vier/config.php:116
-#: view/theme/diabook/theme.php:412 view/theme/diabook/theme.php:630
-#: view/theme/diabook/config.php:164
 msgid "Last users"
 msgstr "Últimos usuarios"
 
 #: view/theme/vier/theme.php:199 view/theme/vier/config.php:115
-#: view/theme/diabook/theme.php:523 view/theme/diabook/theme.php:629
-#: view/theme/diabook/config.php:163
 msgid "Find Friends"
 msgstr "Buscar amigos"
 
-#: view/theme/vier/theme.php:200 view/theme/diabook/theme.php:524
+#: view/theme/vier/theme.php:200
 msgid "Local Directory"
 msgstr "Directorio local"
 
@@ -8779,8 +8793,6 @@ msgid "Quick Start"
 msgstr "Inicio rápido"
 
 #: view/theme/vier/theme.php:373 view/theme/vier/config.php:114
-#: view/theme/diabook/theme.php:606 view/theme/diabook/theme.php:628
-#: view/theme/diabook/config.php:162
 msgid "Connect Services"
 msgstr "Servicios conectados"
 
@@ -8792,68 +8804,14 @@ msgstr "Lista separada por comas de foros de ayuda."
 msgid "Set style"
 msgstr "Definir estilo"
 
-#: view/theme/vier/config.php:111 view/theme/diabook/theme.php:130
-#: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624
-#: view/theme/diabook/config.php:158
+#: view/theme/vier/config.php:111
 msgid "Community Pages"
 msgstr "Páginas de Comunidad"
 
-#: view/theme/vier/config.php:113 view/theme/diabook/theme.php:599
-#: view/theme/diabook/theme.php:627 view/theme/diabook/config.php:161
+#: view/theme/vier/config.php:113
 msgid "Help or @NewHere ?"
 msgstr "¿Ayuda o @NuevoAquí?"
 
-#: view/theme/diabook/theme.php:125
-msgid "Your contacts"
-msgstr "Tus contactos"
-
-#: view/theme/diabook/theme.php:128
-msgid "Your personal photos"
-msgstr "Tus fotos personales"
-
-#: view/theme/diabook/theme.php:441 view/theme/diabook/theme.php:632
-#: view/theme/diabook/config.php:166
-msgid "Last likes"
-msgstr "Últimos \"me gusta\""
-
-#: view/theme/diabook/theme.php:486 view/theme/diabook/theme.php:631
-#: view/theme/diabook/config.php:165
-msgid "Last photos"
-msgstr "Últimas fotos"
-
-#: view/theme/diabook/theme.php:579 view/theme/diabook/theme.php:625
-#: view/theme/diabook/config.php:159
-msgid "Earth Layers"
-msgstr "Minimapa"
-
-#: view/theme/diabook/theme.php:584
-msgid "Set zoomfactor for Earth Layers"
-msgstr "Configurar zoom en Minimapa"
-
-#: view/theme/diabook/theme.php:585 view/theme/diabook/config.php:156
-msgid "Set longitude (X) for Earth Layers"
-msgstr "Configurar longitud (X) en Minimapa"
-
-#: view/theme/diabook/theme.php:586 view/theme/diabook/config.php:157
-msgid "Set latitude (Y) for Earth Layers"
-msgstr "Configurar latitud (Y) en Minimapa"
-
-#: view/theme/diabook/theme.php:622
-msgid "Show/hide boxes at right-hand column:"
-msgstr "Mostrar/Ocultar casillas en la columna derecha:"
-
-#: view/theme/diabook/config.php:153
-msgid "Set resolution for middle column"
-msgstr "Resolución para la columna central"
-
-#: view/theme/diabook/config.php:154
-msgid "Set color scheme"
-msgstr "Configurar esquema de color"
-
-#: view/theme/diabook/config.php:155
-msgid "Set zoomfactor for Earth Layer"
-msgstr "Establecer zoom para Minimapa"
-
 #: view/theme/duepuntozero/config.php:45
 msgid "greenzero"
 msgstr "greenzero"
@@ -8886,51 +8844,51 @@ msgstr "Variaciones"
 msgid "toggle mobile"
 msgstr "Cambiar a versión móvil"
 
-#: boot.php:968
+#: boot.php:969
 msgid "Delete this item?"
 msgstr "¿Eliminar este elemento?"
 
-#: boot.php:971
+#: boot.php:972
 msgid "show fewer"
 msgstr "ver menos"
 
-#: boot.php:1641
+#: boot.php:1650
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Falló la actualización de %s. Mira los registros de errores."
 
-#: boot.php:1753
+#: boot.php:1762
 msgid "Create a New Account"
 msgstr "Crear una nueva cuenta"
 
-#: boot.php:1782
+#: boot.php:1791
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: boot.php:1783
+#: boot.php:1792
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: boot.php:1786
+#: boot.php:1795
 msgid "Or login using OpenID: "
 msgstr "O inicia sesión usando OpenID: "
 
-#: boot.php:1792
+#: boot.php:1801
 msgid "Forgot your password?"
 msgstr "¿Olvidaste la contraseña?"
 
-#: boot.php:1795
+#: boot.php:1804
 msgid "Website Terms of Service"
 msgstr "Términos de uso del sitio"
 
-#: boot.php:1796
+#: boot.php:1805
 msgid "terms of service"
 msgstr "Términos de uso"
 
-#: boot.php:1798
+#: boot.php:1807
 msgid "Website Privacy Policy"
 msgstr "Política de privacidad del sitio"
 
-#: boot.php:1799
+#: boot.php:1808
 msgid "privacy policy"
 msgstr "Política de privacidad"

view/lang/es/strings.php

@@ -115,28 +115,6 @@ $a->strings["Create a new group"] = "Crear un nuevo grupo";
 $a->strings["Group Name: "] = "Nombre del grupo: ";
 $a->strings["Contacts not in any group"] = "Contactos sin grupo";
 $a->strings["add"] = "añadir";
-$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada.";
-$a->strings["An invitation is required."] = "Se necesita invitación.";
-$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación.";
-$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida";
-$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria.";
-$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto.";
-$a->strings["Name too short."] = "El nombre es demasiado corto.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo no se encuentra entre los permitidos en este sitio.";
-$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida.";
-$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "El apodo solo puede contener  \"a-z\", \"0-9\" y \"_\".";
-$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado.";
-$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo.";
-$a->strings["default"] = "predeterminado";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo.";
-$a->strings["Profile Photos"] = "Foto del perfil";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrar en %2\$s. Su cuenta ha sido creada.\n\t";
-$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3\$s\n\t\t\tNombre de la cuenta:\t\t%1\$s\n\t\t\tContraseña:\t\t%5\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2\$s.";
-$a->strings["Registration details for %s"] = "Detalles de registro para %s";
 $a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado";
 $a->strings["Block immediately"] = "Bloquear inmediatamente";
 $a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad";
@@ -166,7 +144,6 @@ $a->strings["Diaspora Connector"] = "Conector Diaspora";
 $a->strings["GNU Social"] = "GNUsocial (OStatus)";
 $a->strings["App.net"] = "App.net";
 $a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix";
-$a->strings["view full size"] = "Ver a tamaño completo";
 $a->strings["Post to Email"] = "Publicar mediante correo electrónico";
 $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Conectores deshabilitados, ya que \"%s\" es habilitado.";
 $a->strings["Hide your profile details from unknown viewers?"] = "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?";
@@ -201,24 +178,6 @@ $a->strings["%d contact not imported"] = array(
 	1 => "%d contactos no importado",
 );
 $a->strings["Done. You can now login with your username and password"] = "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña.";
-$a->strings["System"] = "Sistema";
-$a->strings["Network"] = "Red";
-$a->strings["Personal"] = "Personal";
-$a->strings["Home"] = "Inicio";
-$a->strings["Introductions"] = "Presentaciones";
-$a->strings["%s commented on %s's post"] = "%s comentó la publicación de %s";
-$a->strings["%s created a new post"] = "%s creó una nueva publicación";
-$a->strings["%s liked %s's post"] = "A %s le gusta la publicación de %s";
-$a->strings["%s disliked %s's post"] = "A %s no le gusta la publicación de %s";
-$a->strings["%s is attending %s's event"] = "%s está asistiendo al evento %s's";
-$a->strings["%s is not attending %s's event"] = "%s no está asistiendo al evento %s's";
-$a->strings["%s may attend %s's event"] = "%s podría asistir al evento %s's";
-$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
-$a->strings["Friend Suggestion"] = "Propuestas de amistad";
-$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
-$a->strings["New Follower"] = "Nuevo seguidor";
-$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
-$a->strings["Attachments:"] = "Archivos adjuntos:";
 $a->strings["General Features"] = "Opciones generales";
 $a->strings["Multiple Profiles"] = "Perfiles multiples";
 $a->strings["Ability to create multiple profiles"] = "Capacidad de crear perfiles multiples. Cada pagina/perfil/usuario puede tener diferentes perfiles/apariencias. Las mismas pueden ser visibles para determinados contactos seleccionados dentro de la red friendica.";
@@ -269,115 +228,10 @@ $a->strings["Mute Post Notifications"] = "Silenciar notificaciones de una public
 $a->strings["Ability to mute notifications for a thread"] = "Habilidad de silenciar notificaciones sobre nuevos comentarios en una publicación.";
 $a->strings["Advanced Profile Settings"] = "Ajustes avanzados del perfil";
 $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles.";
-$a->strings["(no subject)"] = "(sin asunto)";
-$a->strings["noreply"] = "no responder";
-$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada.";
-$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada.";
-$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada.";
 $a->strings["Image/photo"] = "Imagen/Foto";
 $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
 $a->strings["$1 wrote:"] = "$1 escribió:";
 $a->strings["Encrypted content"] = "Contenido cifrado";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s";
-$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s atenderá quizás %2\$s's %3\$s";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ahora es amigo de %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s le dio un toque a %2\$s";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s está actualmente %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %3\$s de %2\$s con %4\$s";
-$a->strings["post/item"] = "publicación/tema";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s ha marcado %3\$s de %2\$s como Favorito";
-$a->strings["Likes"] = "Me gusta";
-$a->strings["Dislikes"] = "No me gusta";
-$a->strings["Attending"] = array(
-	0 => "Atendiendo",
-	1 => "Atendiendo",
-);
-$a->strings["Not attending"] = "No atendiendo";
-$a->strings["Might attend"] = "Puede que atienda";
-$a->strings["Select"] = "Seleccionar";
-$a->strings["Delete"] = "Eliminar";
-$a->strings["View %s's profile @ %s"] = "Ver perfil de %s @ %s";
-$a->strings["Categories:"] = "Categorías:";
-$a->strings["Filed under:"] = "Archivado en:";
-$a->strings["%s from %s"] = "%s de %s";
-$a->strings["View in context"] = "Verlo en contexto";
-$a->strings["Please wait"] = "Por favor, espera";
-$a->strings["remove"] = "eliminar";
-$a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
-$a->strings["Follow Thread"] = "Seguir publicacion";
-$a->strings["View Status"] = "Ver estado";
-$a->strings["View Profile"] = "Ver perfil";
-$a->strings["View Photos"] = "Ver fotos";
-$a->strings["Network Posts"] = "Publicaciones en la red";
-$a->strings["View Contact"] = "Ver contacto";
-$a->strings["Send PM"] = "Enviar mensaje privado";
-$a->strings["Poke"] = "Toque";
-$a->strings["%s likes this."] = "A %s le gusta esto.";
-$a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
-$a->strings["%s attends."] = "%s atiende.";
-$a->strings["%s doesn't attend."] = "%s no atenderá.";
-$a->strings["%s attends maybe."] = "%s quizás atenderá";
-$a->strings["and"] = "y";
-$a->strings[", and %d other people"] = " y a otras %d personas";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d personas</span> les gusta esto";
-$a->strings["%s like this."] = "A %s le gusta esto.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d personas</span> no les gusta esto";
-$a->strings["%s don't like this."] = "A %s no le gusta esto.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d personas</span> atienden";
-$a->strings["%s attend."] = "%s atiende.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d personas</span>no atienden";
-$a->strings["%s don't attend."] = "%s no atiende.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d people</span> quizá asistan";
-$a->strings["%s anttend maybe."] = "%s atiende quizás.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>";
-$a->strings["Please enter a link URL:"] = "Introduce la dirección del enlace:";
-$a->strings["Please enter a video link/URL:"] = "Por favor, introduce la URL/enlace del vídeo:";
-$a->strings["Please enter an audio link/URL:"] = "Por favor, introduce la URL/enlace del audio:";
-$a->strings["Tag term:"] = "Etiquetar:";
-$a->strings["Save to Folder:"] = "Guardar en directorio:";
-$a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
-$a->strings["Delete item(s)?"] = "¿Borrar objeto(s)?";
-$a->strings["Share"] = "Compartir";
-$a->strings["Upload photo"] = "Subir foto";
-$a->strings["upload photo"] = "subir imagen";
-$a->strings["Attach file"] = "Adjuntar archivo";
-$a->strings["attach file"] = "adjuntar archivo";
-$a->strings["Insert web link"] = "Insertar enlace";
-$a->strings["web link"] = "enlace web";
-$a->strings["Insert video link"] = "Insertar enlace del vídeo";
-$a->strings["video link"] = "enlace de video";
-$a->strings["Insert audio link"] = "Insertar vínculo del audio";
-$a->strings["audio link"] = "enlace de audio";
-$a->strings["Set your location"] = "Configurar tu localización";
-$a->strings["set location"] = "establecer tu ubicación";
-$a->strings["Clear browser location"] = "Borrar la localización del navegador";
-$a->strings["clear location"] = "limpiar la localización";
-$a->strings["Set title"] = "Establecer el título";
-$a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
-$a->strings["Permission settings"] = "Configuración de permisos";
-$a->strings["permissions"] = "permisos";
-$a->strings["Public post"] = "Publicación pública";
-$a->strings["Preview"] = "Vista previa";
-$a->strings["Cancel"] = "Cancelar";
-$a->strings["Post to Groups"] = "Publicar hacia grupos";
-$a->strings["Post to Contacts"] = "Publicar hacia contactos";
-$a->strings["Private post"] = "Publicación privada";
-$a->strings["Message"] = "Mensaje";
-$a->strings["Browser"] = "Navegador";
-$a->strings["View all"] = "Ver todos los contactos";
-$a->strings["Like"] = array(
-	0 => "Me gusta",
-	1 => "Me gusta",
-);
-$a->strings["Dislike"] = array(
-	0 => "No me gusta",
-	1 => "No me gusta",
-);
-$a->strings["Not Attending"] = array(
-	0 => "No atendiendo",
-	1 => "No atendiendo",
-);
 $a->strings["Miscellaneous"] = "Varios";
 $a->strings["Birthday:"] = "Fecha de nacimiento:";
 $a->strings["Age: "] = "Edad: ";
@@ -401,15 +255,11 @@ $a->strings["seconds"] = "segundos";
 $a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s";
 $a->strings["%s's birthday"] = "Cumpleaños de %s";
 $a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s";
-$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]";
-$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
-$a->strings["Errors encountered performing database changes."] = "Errores encontrados al ejecutar cambios en la base de datos.";
-$a->strings["%s\\'s birthday"] = "%s\\'s cumpleaños";
 $a->strings["Friendica Notification"] = "Notificación de Friendica";
 $a->strings["Thank You,"] = "Gracias,";
 $a->strings["%s Administrator"] = "%s Administrador";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrador";
+$a->strings["noreply"] = "no responder";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificación] Nuevo correo recibido de %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s te ha enviado un mensaje privado desde %2\$s.";
@@ -524,11 +374,214 @@ $a->strings["The profile address specified belongs to a network which has been d
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas.";
 $a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto.";
 $a->strings["following"] = "siguiendo";
+$a->strings["Nothing new here"] = "Nada nuevo por aquí";
+$a->strings["Clear notifications"] = "Limpiar notificaciones";
+$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido";
+$a->strings["Logout"] = "Salir";
+$a->strings["End this session"] = "Cerrar la sesión";
+$a->strings["Status"] = "Estado";
+$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Your profile page"] = "Tu página de perfil";
+$a->strings["Photos"] = "Fotografías";
+$a->strings["Your photos"] = "Tus fotos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Your videos"] = "Tus videos";
+$a->strings["Events"] = "Eventos";
+$a->strings["Your events"] = "Tus eventos";
+$a->strings["Personal notes"] = "Notas personales";
+$a->strings["Your personal notes"] = "Tus notas personales";
+$a->strings["Login"] = "Acceder";
+$a->strings["Sign in"] = "Date de alta";
+$a->strings["Home"] = "Inicio";
+$a->strings["Home Page"] = "Página de inicio";
+$a->strings["Register"] = "Registrarse";
+$a->strings["Create an account"] = "Crea una cuenta";
+$a->strings["Help"] = "Ayuda";
+$a->strings["Help and documentation"] = "Ayuda y documentación";
+$a->strings["Apps"] = "Aplicaciones";
+$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos";
+$a->strings["Search"] = "Buscar";
+$a->strings["Search site content"] = " Busca contenido en la página";
+$a->strings["Full Text"] = "Texto completo";
+$a->strings["Tags"] = "Tags";
+$a->strings["Contacts"] = "Contactos";
+$a->strings["Community"] = "Comunidad";
+$a->strings["Conversations on this site"] = "Conversaciones en este sitio";
+$a->strings["Conversations on the network"] = "Conversaciones en la red";
+$a->strings["Events and Calendar"] = "Eventos y Calendario";
+$a->strings["Directory"] = "Directorio";
+$a->strings["People directory"] = "Directorio de usuarios";
+$a->strings["Information"] = "Información";
+$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica";
+$a->strings["Network"] = "Red";
+$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
+$a->strings["Network Reset"] = "Reseteo de la red";
+$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros";
+$a->strings["Introductions"] = "Presentaciones";
+$a->strings["Friend Requests"] = "Solicitudes de amistad";
+$a->strings["Notifications"] = "Notificaciones";
+$a->strings["See all notifications"] = "Ver todas las notificaciones";
+$a->strings["Mark as seen"] = "Marcar como leído";
+$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Private mail"] = "Correo privado";
+$a->strings["Inbox"] = "Entrada";
+$a->strings["Outbox"] = "Enviados";
+$a->strings["New Message"] = "Nuevo mensaje";
+$a->strings["Manage"] = "Administrar";
+$a->strings["Manage other pages"] = "Administrar otras páginas";
+$a->strings["Delegations"] = "Delegaciones";
+$a->strings["Delegate Page Management"] = "Delegar la administración de la página";
+$a->strings["Settings"] = "Configuración";
+$a->strings["Account settings"] = "Configuración de tu cuenta";
+$a->strings["Profiles"] = "Perfiles";
+$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles";
+$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
+$a->strings["Navigation"] = "Navegación";
+$a->strings["Site map"] = "Mapa del sitio";
+$a->strings["Embedded content"] = "Contenido integrado";
+$a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado";
+$a->strings["Contact Photos"] = "Foto del contacto";
+$a->strings["Welcome "] = "Bienvenido ";
+$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
+$a->strings["Welcome back "] = "Bienvenido de nuevo ";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo.";
+$a->strings["stopped following"] = "dejó de seguir";
+$a->strings["View Profile"] = "Ver perfil";
+$a->strings["View Status"] = "Ver estado";
+$a->strings["View Photos"] = "Ver fotos";
+$a->strings["Network Posts"] = "Publicaciones en la red";
+$a->strings["View Contact"] = "Ver contacto";
+$a->strings["Drop Contact"] = "Eliminar contacto";
+$a->strings["Send PM"] = "Enviar mensaje privado";
+$a->strings["Poke"] = "Toque";
+$a->strings["Organisation"] = "Organización";
+$a->strings["News"] = "Noticias";
+$a->strings["Forum"] = "Foro";
+$a->strings["System"] = "Sistema";
+$a->strings["Personal"] = "Personal";
+$a->strings["%s commented on %s's post"] = "%s comentó la publicación de %s";
+$a->strings["%s created a new post"] = "%s creó una nueva publicación";
+$a->strings["%s liked %s's post"] = "A %s le gusta la publicación de %s";
+$a->strings["%s disliked %s's post"] = "A %s no le gusta la publicación de %s";
+$a->strings["%s is attending %s's event"] = "%s está asistiendo al evento %s's";
+$a->strings["%s is not attending %s's event"] = "%s no está asistiendo al evento %s's";
+$a->strings["%s may attend %s's event"] = "%s podría asistir al evento %s's";
+$a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s";
+$a->strings["Friend Suggestion"] = "Propuestas de amistad";
+$a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión";
+$a->strings["New Follower"] = "Nuevo seguidor";
+$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada.";
+$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada.";
+$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada.";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s atenderá quizás %2\$s's %3\$s";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ahora es amigo de %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s le dio un toque a %2\$s";
+$a->strings["%1\$s is currently %2\$s"] = "%1\$s está actualmente %2\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %3\$s de %2\$s con %4\$s";
+$a->strings["post/item"] = "publicación/tema";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s ha marcado %3\$s de %2\$s como Favorito";
+$a->strings["Likes"] = "Me gusta";
+$a->strings["Dislikes"] = "No me gusta";
+$a->strings["Attending"] = array(
+	0 => "Atendiendo",
+	1 => "Atendiendo",
+);
+$a->strings["Not attending"] = "No atendiendo";
+$a->strings["Might attend"] = "Puede que atienda";
+$a->strings["Select"] = "Seleccionar";
+$a->strings["Delete"] = "Eliminar";
+$a->strings["View %s's profile @ %s"] = "Ver perfil de %s @ %s";
+$a->strings["Categories:"] = "Categorías:";
+$a->strings["Filed under:"] = "Archivado en:";
+$a->strings["%s from %s"] = "%s de %s";
+$a->strings["View in context"] = "Verlo en contexto";
+$a->strings["Please wait"] = "Por favor, espera";
+$a->strings["remove"] = "eliminar";
+$a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
+$a->strings["Follow Thread"] = "Seguir publicacion";
+$a->strings["%s likes this."] = "A %s le gusta esto.";
+$a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
+$a->strings["%s attends."] = "%s atiende.";
+$a->strings["%s doesn't attend."] = "%s no atenderá.";
+$a->strings["%s attends maybe."] = "%s quizás atenderá";
+$a->strings["and"] = "y";
+$a->strings[", and %d other people"] = " y a otras %d personas";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d personas</span> les gusta esto";
+$a->strings["%s like this."] = "A %s le gusta esto.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d personas</span> no les gusta esto";
+$a->strings["%s don't like this."] = "A %s no le gusta esto.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d personas</span> atienden";
+$a->strings["%s attend."] = "%s atiende.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d personas</span>no atienden";
+$a->strings["%s don't attend."] = "%s no atiende.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d people</span> quizá asistan";
+$a->strings["%s anttend maybe."] = "%s atiende quizás.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>";
+$a->strings["Please enter a link URL:"] = "Introduce la dirección del enlace:";
+$a->strings["Please enter a video link/URL:"] = "Por favor, introduce la URL/enlace del vídeo:";
+$a->strings["Please enter an audio link/URL:"] = "Por favor, introduce la URL/enlace del audio:";
+$a->strings["Tag term:"] = "Etiquetar:";
+$a->strings["Save to Folder:"] = "Guardar en directorio:";
+$a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
+$a->strings["Delete item(s)?"] = "¿Borrar objeto(s)?";
+$a->strings["Share"] = "Compartir";
+$a->strings["Upload photo"] = "Subir foto";
+$a->strings["upload photo"] = "subir imagen";
+$a->strings["Attach file"] = "Adjuntar archivo";
+$a->strings["attach file"] = "adjuntar archivo";
+$a->strings["Insert web link"] = "Insertar enlace";
+$a->strings["web link"] = "enlace web";
+$a->strings["Insert video link"] = "Insertar enlace del vídeo";
+$a->strings["video link"] = "enlace de video";
+$a->strings["Insert audio link"] = "Insertar vínculo del audio";
+$a->strings["audio link"] = "enlace de audio";
+$a->strings["Set your location"] = "Configurar tu localización";
+$a->strings["set location"] = "establecer tu ubicación";
+$a->strings["Clear browser location"] = "Borrar la localización del navegador";
+$a->strings["clear location"] = "limpiar la localización";
+$a->strings["Set title"] = "Establecer el título";
+$a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+$a->strings["Permission settings"] = "Configuración de permisos";
+$a->strings["permissions"] = "permisos";
+$a->strings["Public post"] = "Publicación pública";
+$a->strings["Preview"] = "Vista previa";
+$a->strings["Cancel"] = "Cancelar";
+$a->strings["Post to Groups"] = "Publicar hacia grupos";
+$a->strings["Post to Contacts"] = "Publicar hacia contactos";
+$a->strings["Private post"] = "Publicación privada";
+$a->strings["Message"] = "Mensaje";
+$a->strings["Browser"] = "Navegador";
+$a->strings["View all"] = "Ver todos los contactos";
+$a->strings["Like"] = array(
+	0 => "Me gusta",
+	1 => "Me gusta",
+);
+$a->strings["Dislike"] = array(
+	0 => "No me gusta",
+	1 => "No me gusta",
+);
+$a->strings["Not Attending"] = array(
+	0 => "No atendiendo",
+	1 => "No atendiendo",
+);
+$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización  %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]";
+$a->strings["Errors encountered creating database tables."] = "Se han encontrados errores creando las tablas de la base de datos.";
+$a->strings["Errors encountered performing database changes."] = "Errores encontrados al ejecutar cambios en la base de datos.";
+$a->strings["(no subject)"] = "(sin asunto)";
+$a->strings["%s\\'s birthday"] = "%s\\'s cumpleaños";
+$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*";
+$a->strings["Attachments:"] = "Archivos adjuntos:";
 $a->strings["Requested account is not available."] = "La cuenta solicitada no está disponible.";
 $a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
 $a->strings["Edit profile"] = "Editar perfil";
 $a->strings["Atom feed"] = "Atom feed";
-$a->strings["Profiles"] = "Perfiles";
 $a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
 $a->strings["Change profile photo"] = "Cambiar foto del perfil";
 $a->strings["Create New Profile"] = "Crear nuevo perfil";
@@ -549,7 +602,6 @@ $a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
 $a->strings["[No description]"] = "[Sin descripción]";
 $a->strings["Event Reminders"] = "Recordatorios de eventos";
 $a->strings["Events this week:"] = "Eventos de esta semana:";
-$a->strings["Profile"] = "Perfil";
 $a->strings["Full Name:"] = "Nombre completo:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -574,87 +626,18 @@ $a->strings["School/education:"] = "Escuela/estudios:";
 $a->strings["Forums:"] = "Foros:";
 $a->strings["Basic"] = "Basic";
 $a->strings["Advanced"] = "Avanzado";
-$a->strings["Status"] = "Estado";
 $a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones";
 $a->strings["Profile Details"] = "Detalles del Perfil";
-$a->strings["Photos"] = "Fotografías";
 $a->strings["Photo Albums"] = "Álbum de Fotos";
-$a->strings["Videos"] = "Videos";
-$a->strings["Events"] = "Eventos";
-$a->strings["Events and Calendar"] = "Eventos y Calendario";
 $a->strings["Personal Notes"] = "Notas personales";
 $a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto";
-$a->strings["Contacts"] = "Contactos";
 $a->strings["[Name Withheld]"] = "[Nombre oculto]";
 $a->strings["Item not found."] = "Elemento no encontrado.";
 $a->strings["Do you really want to delete this item?"] = "¿Realmente quieres borrar este objeto?";
 $a->strings["Yes"] = "Sí";
 $a->strings["Permission denied."] = "Permiso denegado.";
 $a->strings["Archives"] = "Archivos";
-$a->strings["Nothing new here"] = "Nada nuevo por aquí";
-$a->strings["Clear notifications"] = "Limpiar notificaciones";
-$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido";
-$a->strings["Logout"] = "Salir";
-$a->strings["End this session"] = "Cerrar la sesión";
-$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones";
-$a->strings["Your profile page"] = "Tu página de perfil";
-$a->strings["Your photos"] = "Tus fotos";
-$a->strings["Your videos"] = "Tus videos";
-$a->strings["Your events"] = "Tus eventos";
-$a->strings["Personal notes"] = "Notas personales";
-$a->strings["Your personal notes"] = "Tus notas personales";
-$a->strings["Login"] = "Acceder";
-$a->strings["Sign in"] = "Date de alta";
-$a->strings["Home Page"] = "Página de inicio";
-$a->strings["Register"] = "Registrarse";
-$a->strings["Create an account"] = "Crea una cuenta";
-$a->strings["Help"] = "Ayuda";
-$a->strings["Help and documentation"] = "Ayuda y documentación";
-$a->strings["Apps"] = "Aplicaciones";
-$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos";
-$a->strings["Search"] = "Buscar";
-$a->strings["Search site content"] = " Busca contenido en la página";
-$a->strings["Full Text"] = "Texto completo";
-$a->strings["Tags"] = "Tags";
-$a->strings["Community"] = "Comunidad";
-$a->strings["Conversations on this site"] = "Conversaciones en este sitio";
-$a->strings["Conversations on the network"] = "Conversaciones en la red";
-$a->strings["Directory"] = "Directorio";
-$a->strings["People directory"] = "Directorio de usuarios";
-$a->strings["Information"] = "Información";
-$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica";
-$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos";
-$a->strings["Network Reset"] = "Reseteo de la red";
-$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros";
-$a->strings["Friend Requests"] = "Solicitudes de amistad";
-$a->strings["Notifications"] = "Notificaciones";
-$a->strings["See all notifications"] = "Ver todas las notificaciones";
-$a->strings["Mark as seen"] = "Marcar como leído";
-$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Private mail"] = "Correo privado";
-$a->strings["Inbox"] = "Entrada";
-$a->strings["Outbox"] = "Enviados";
-$a->strings["New Message"] = "Nuevo mensaje";
-$a->strings["Manage"] = "Administrar";
-$a->strings["Manage other pages"] = "Administrar otras páginas";
-$a->strings["Delegations"] = "Delegaciones";
-$a->strings["Delegate Page Management"] = "Delegar la administración de la página";
-$a->strings["Settings"] = "Configuración";
-$a->strings["Account settings"] = "Configuración de tu cuenta";
-$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles";
-$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos";
-$a->strings["Admin"] = "Admin";
-$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio";
-$a->strings["Navigation"] = "Navegación";
-$a->strings["Site map"] = "Mapa del sitio";
-$a->strings["Embedded content"] = "Contenido integrado";
-$a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado";
-$a->strings["Contact Photos"] = "Foto del contacto";
-$a->strings["Welcome "] = "Bienvenido ";
-$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil.";
-$a->strings["Welcome back "] = "Bienvenido de nuevo ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo.";
+$a->strings["view full size"] = "Ver a tamaño completo";
 $a->strings["newer"] = "más nuevo";
 $a->strings["older"] = "más antiguo";
 $a->strings["prev"] = "ant.";
@@ -714,11 +697,30 @@ $a->strings["comment"] = array(
 );
 $a->strings["post"] = "Publicación";
 $a->strings["Item filed"] = "Elemento archivado";
-$a->strings["stopped following"] = "dejó de seguir";
-$a->strings["Drop Contact"] = "Eliminar contacto";
-$a->strings["Organisation"] = "Organización";
-$a->strings["News"] = "Noticias";
-$a->strings["Forum"] = "Foro";
+$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada.";
+$a->strings["An invitation is required."] = "Se necesita invitación.";
+$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación.";
+$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida";
+$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria.";
+$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto.";
+$a->strings["Name too short."] = "El nombre es demasiado corto.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo no se encuentra entre los permitidos en este sitio.";
+$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida.";
+$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "El apodo solo puede contener  \"a-z\", \"0-9\" y \"_\".";
+$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado.";
+$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo.";
+$a->strings["default"] = "predeterminado";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo.";
+$a->strings["Profile Photos"] = "Foto del perfil";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrarse en %2\$s. Su cuenta está pendiente de aprobación por el administrador.\n\t";
+$a->strings["Registration at %s"] = "Registro en %s";
+$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrar en %2\$s. Su cuenta ha sido creada.\n\t";
+$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3\$s\n\t\t\tNombre de la cuenta:\t\t%1\$s\n\t\t\tContraseña:\t\t%5\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a  %2\$s.";
+$a->strings["Registration details for %s"] = "Detalles de registro para %s";
 $a->strings["Post successful."] = "¡Publicado!";
 $a->strings["Access denied."] = "Acceso denegado.";
 $a->strings["Welcome to %s"] = "Bienvenido a %s";
@@ -763,10 +765,6 @@ $a->strings["No profile"] = "Nigún perfil";
 $a->strings["Help:"] = "Ayuda:";
 $a->strings["Not Found"] = "No se ha encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
-$a->strings["Invalid request."] = "Consulta invalida";
-$a->strings["Image exceeds size limit of %s"] = "La imagen excede el limite de %s";
-$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
-$a->strings["Image upload failed."] = "Error al subir la imagen.";
 $a->strings["Remote privacy information not available."] = "Privacidad de la información remota no disponible.";
 $a->strings["Visible to:"] = "Visible para:";
 $a->strings["OpenID protocol error. No ID returned."] = "Error de protocolo OpenID. ID no devuelta.";
@@ -820,10 +818,6 @@ $a->strings["Tag removed"] = "Etiqueta eliminada";
 $a->strings["Remove Item Tag"] = "Eliminar etiqueta";
 $a->strings["Select a tag to remove: "] = "Selecciona una etiqueta para eliminar: ";
 $a->strings["Remove"] = "Eliminar";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite.";
-$a->strings["Or - did you try to upload an empty file?"] = "Si no - intento de subir un archivo vacío?";
-$a->strings["File exceeds size limit of %s"] = "El archivo excede el limite de tamaño de %s";
-$a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
 $a->strings["Resubscribing to OStatus contacts"] = "Resubscribir a contactos de OStatus";
 $a->strings["Error"] = "error";
 $a->strings["Done"] = "hecho!";
@@ -1098,6 +1092,8 @@ $a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, per
 $a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s].";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente.";
 $a->strings["Unable to process image"] = "Imposible procesar la imagen";
+$a->strings["Image exceeds size limit of %s"] = "La imagen excede el limite de %s";
+$a->strings["Unable to process image."] = "Imposible procesar la imagen.";
 $a->strings["Upload File:"] = "Subir archivo:";
 $a->strings["Select a profile:"] = "Elige un perfil:";
 $a->strings["Upload"] = "Subir";
@@ -1108,6 +1104,7 @@ $a->strings["Crop Image"] = "Recortar imagen";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor, ajusta el recorte de la imagen para optimizarla.";
 $a->strings["Done Editing"] = "Editado";
 $a->strings["Image uploaded successfully."] = "Imagen subida con éxito.";
+$a->strings["Image upload failed."] = "Error al subir la imagen.";
 $a->strings["Account approved."] = "Cuenta aprobada.";
 $a->strings["Registration revoked for %s"] = "Registro anulado para %s";
 $a->strings["Please login."] = "Por favor accede.";
@@ -1211,6 +1208,207 @@ $a->strings["Work/employment"] = "Trabajo/ocupación";
 $a->strings["School/education"] = "Escuela/estudios";
 $a->strings["Contact information and Social Networks"] = "Informacioń de contacto y Redes sociales";
 $a->strings["Edit/Manage Profiles"] = "Editar/Administrar perfiles";
+$a->strings["No friends to display."] = "No hay amigos para mostrar.";
+$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido.";
+$a->strings["View"] = "Vista";
+$a->strings["Previous"] = "Previo";
+$a->strings["Next"] = "Siguiente";
+$a->strings["list"] = "lista";
+$a->strings["User not found"] = "Usuario no encontrado";
+$a->strings["This calendar format is not supported"] = "Este formato de calendario no se soporta";
+$a->strings["No exportable data found"] = "No se ha encontrado información exportable";
+$a->strings["calendar"] = "calendario";
+$a->strings["No contacts in common."] = "Sin contactos en común.";
+$a->strings["Common Friends"] = "Amigos comunes";
+$a->strings["Not available."] = "No disponible";
+$a->strings["%d contact edited."] = array(
+	0 => "%d contacto editado.",
+	1 => "%d contacts edited.",
+);
+$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
+$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
+$a->strings["Contact updated."] = "Contacto actualizado.";
+$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
+$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
+$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
+$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
+$a->strings["Contact has been archived"] = "El contacto ha sido archivado";
+$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado";
+$a->strings["Drop contact"] = "Eliminar contacto";
+$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?";
+$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
+$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s";
+$a->strings["You are sharing with %s"] = "Estás compartiendo con %s";
+$a->strings["%s is sharing with you"] = "%s está compartiendo contigo";
+$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
+$a->strings["Never"] = "Nunca";
+$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
+$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
+$a->strings["Suggest friends"] = "Sugerir amigos";
+$a->strings["Network type: %s"] = "Tipo de red: %s";
+$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!";
+$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds";
+$a->strings["Disabled"] = "Deshabilitado";
+$a->strings["Fetch information"] = "Recaudar informacion";
+$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves";
+$a->strings["Contact"] = "Contacto";
+$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura.";
+$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
+$a->strings["Edit contact notes"] = "Editar notas del contacto";
+$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
+$a->strings["Ignore contact"] = "Ignorar contacto";
+$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección";
+$a->strings["View conversations"] = "Ver conversaciones";
+$a->strings["Last update:"] = "Última actualización:";
+$a->strings["Update public posts"] = "Actualizar publicaciones públicas";
+$a->strings["Update now"] = "Actualizar ahora";
+$a->strings["Unblock"] = "Desbloquear";
+$a->strings["Block"] = "Bloquear";
+$a->strings["Unignore"] = "Quitar de Ignorados";
+$a->strings["Currently blocked"] = "Bloqueados";
+$a->strings["Currently ignored"] = "Ignorados";
+$a->strings["Currently archived"] = "Archivados";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles.";
+$a->strings["Notification for new posts"] = "Notificacion de nuevos temas.";
+$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto.";
+$a->strings["Blacklisted keywords"] = "Lista negra de palabras";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado";
+$a->strings["Actions"] = "Acciones";
+$a->strings["Contact Settings"] = "Ajustes del contacto";
+$a->strings["Suggestions"] = "Sugerencias";
+$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
+$a->strings["Show all contacts"] = "Mostrar todos los contactos";
+$a->strings["Unblocked"] = "Desbloqueados";
+$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear";
+$a->strings["Blocked"] = "Bloqueados";
+$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados";
+$a->strings["Ignored"] = "Ignorados";
+$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados";
+$a->strings["Archived"] = "Archivados";
+$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados";
+$a->strings["Hidden"] = "Ocultos";
+$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos";
+$a->strings["Search your contacts"] = "Buscar en tus contactos";
+$a->strings["Update"] = "Actualizar";
+$a->strings["Archive"] = "Archivo";
+$a->strings["Unarchive"] = "Sin archivar";
+$a->strings["Batch Actions"] = "Accones en lote";
+$a->strings["View all contacts"] = "Ver todos los contactos";
+$a->strings["View all common friends"] = "Ver todos los conocidos en común ";
+$a->strings["Advanced Contact Settings"] = "Configuración avanzada";
+$a->strings["Mutual Friendship"] = "Amistad recíproca";
+$a->strings["is a fan of yours"] = "es tu fan";
+$a->strings["you are a fan of"] = "eres fan de";
+$a->strings["Toggle Blocked status"] = "Cambiar bloqueados";
+$a->strings["Toggle Ignored status"] = "Cambiar ignorados";
+$a->strings["Toggle Archive status"] = "Cambiar archivados";
+$a->strings["Delete contact"] = "Eliminar contacto";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Find on this site"] = "Buscar en este sitio";
+$a->strings["Results for:"] = "Resultados para:";
+$a->strings["Site Directory"] = "Directorio del sitio";
+$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
+$a->strings["People Search - %s"] = "Buscar perfiles - %s";
+$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s";
+$a->strings["No matches"] = "Sin conincidencias";
+$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
+$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo.";
+$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas.";
+$a->strings["Create New Event"] = "Crea un evento nuevo";
+$a->strings["Event details"] = "Detalles del evento";
+$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo";
+$a->strings["Event Starts:"] = "Inicio del evento:";
+$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
+$a->strings["Event Finishes:"] = "Finalización del evento:";
+$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
+$a->strings["Description:"] = "Descripción:";
+$a->strings["Title:"] = "Título:";
+$a->strings["Share this event"] = "Comparte este evento";
+$a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración";
+$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos.";
+$a->strings["Could not create table."] = "No se puede crear la tabla.";
+$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Base de datos ya se encuentra en uso";
+$a->strings["System check"] = "Verificación del sistema";
+$a->strings["Check again"] = "Compruebalo de nuevo";
+$a->strings["Database connection"] = "Conexión con la base de datos";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar.";
+$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
+$a->strings["Database Login Name"] = "Usuario de la base de datos";
+$a->strings["Database Login Password"] = "Contraseña de la base de datos";
+$a->strings["Database Name"] = "Nombre de la base de datos";
+$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web.";
+$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web";
+$a->strings["Site settings"] = "Configuración de la página web";
+$a->strings["System Language:"] = "Sistema de idioma:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails.";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
+$a->strings["PHP executable path"] = "Dirección al ejecutable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación.";
+$a->strings["Command line PHP"] = "Línea de comandos PHP";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)";
+$a->strings["Found PHP version: "] = "Versión PHP encontrada:";
+$a->strings["PHP cli binary"] = "PHP cli binario";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
+$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claves de encriptación";
+$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
+$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD";
+$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
+$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
+$a->strings["mb_string PHP module"] = "Módulo PHP mb_string";
+$a->strings["mcrypt PHP module"] = "modulo mycrypt PHP";
+$a->strings["XML PHP module"] = "Módulo XML PHP";
+$a->strings["iconv module"] = "Módulo iconv";
+$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: modulo mycrypt PHP requerido pero no instalado.";
+$a->strings["Error: iconv PHP module required but not installed."] = "Error: módulo iconv PHP requerido pero no instalado.";
+$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración";
+$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer.";
+$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() función";
+$a->strings["Error, XML PHP module required but not installed."] = "Error, módulo XML PHP requerido pero no instalado.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene.";
+$a->strings["view/smarty3 is writable"] = "Se puede escribir en /view/smarty3";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
+$a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick supporta GIF";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
+$a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
+$a->strings["System down for maintenance"] = "Servicio suspendido por mantenimiento";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado.";
+$a->strings["is interested in:"] = "estás interesado en:";
+$a->strings["Profile Match"] = "Coincidencias de Perfil";
+$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
+$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas.";
+$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
 $a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada.";
 $a->strings["Site"] = "Sitio";
 $a->strings["Users"] = "Usuarios";
@@ -1227,6 +1425,7 @@ $a->strings["check webfinger"] = "Verificar webfinger";
 $a->strings["Plugin Features"] = "Características del módulo";
 $a->strings["diagnostics"] = "diagnosticos";
 $a->strings["User registrations waiting for confirmation"] = "Registro de usuarios esperando la confirmación";
+$a->strings["unknown"] = "desconocido";
 $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Esta pagina ofrece algunos datos sobre la red conocida a la que tu nodo friendica esta conectado. Estos nummeros no son completos respecto a las redes federadas, si no refleja los nodos esta instancia conoce. ";
 $a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "El modulo <em>directorio de contactos encontrados</em> no esta habilitado, habilitado aumentara la cantidad de datos detallados aquí.";
 $a->strings["Administration"] = "Administración";
@@ -1237,6 +1436,8 @@ $a->strings["Recipient Profile"] = "Perfil del recipiente";
 $a->strings["Created"] = "Creado";
 $a->strings["Last Tried"] = "Ultimo intento";
 $a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "Esta pagina muestra la cola de mensajes salientes. Estos son publicaciones cuyo envío inicial fallo. Serán reenviados mas tarde y eventualmente eliminados si la entrega falla permanentemente. ";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the <tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"] = "Su DB aún funciona con las tablas MyISAM. Debería cambiar el tipo de motror a InnoDB. ¡Como Friendica sólo usará las características de InnoDB en el futuro, debería cambiar esto! Vea <a href=\"%s\">aquí</a> para una guía que puede ayudar a convertir las tablas de motor. También puede usar <tt>convert_innodb.sql</tt> en el directorio <tt>/util</tt> de su instalación de Friendica.<br />";
+$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "Está usando una versión de MySQL que no soporta todas las características de Friendica. Debería considerar cambiar a MariaDB.";
 $a->strings["Normal Account"] = "Cuenta normal";
 $a->strings["Soapbox Account"] = "Cuenta tribuna";
 $a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad";
@@ -1256,9 +1457,7 @@ $a->strings["No special theme for mobile devices"] = "No hay tema especial para
 $a->strings["No community page"] = "No hay pagina de comunidad";
 $a->strings["Public postings from users of this site"] = "Temas públicos de perfiles de este sitio.";
 $a->strings["Global community page"] = "Pagina global de comunidad";
-$a->strings["Never"] = "Nunca";
 $a->strings["At post arrival"] = "A la llegada de una publicación";
-$a->strings["Disabled"] = "Deshabilitado";
 $a->strings["Users, Global Contacts"] = "Perfiles, contactos globales";
 $a->strings["Users, Global Contacts/fallback"] = "Perfiles, contactos globales/fallback";
 $a->strings["One month"] = "Un mes";
@@ -1469,9 +1668,8 @@ $a->strings["User registrations waiting for confirm"] = "Registro de usuarios es
 $a->strings["User waiting for permanent deletion"] = "Usuario esperando anulación permanente.";
 $a->strings["Request date"] = "Solicitud de fecha";
 $a->strings["No registrations."] = "Sin registros.";
+$a->strings["Note from the user"] = "Nota para el usuario";
 $a->strings["Deny"] = "Denegado";
-$a->strings["Block"] = "Bloquear";
-$a->strings["Unblock"] = "Desbloquear";
 $a->strings["Site admin"] = "Administrador de la web";
 $a->strings["Account expired"] = "Cuenta caducada";
 $a->strings["New User"] = "Nuevo usuario";
@@ -1511,194 +1709,6 @@ $a->strings["Off"] = "Apagado";
 $a->strings["On"] = "Encendido";
 $a->strings["Lock feature %s"] = "Trancar opción %s ";
 $a->strings["Manage Additional Features"] = "Administrar opciones adicionales";
-$a->strings["No friends to display."] = "No hay amigos para mostrar.";
-$a->strings["Access to this profile has been restricted."] = "El acceso a este perfil ha sido restringido.";
-$a->strings["View"] = "Vista";
-$a->strings["Previous"] = "Previo";
-$a->strings["Next"] = "Siguiente";
-$a->strings["list"] = "lista";
-$a->strings["User not found"] = "Usuario no encontrado";
-$a->strings["This calendar format is not supported"] = "Este formato de calendario no se soporta";
-$a->strings["No exportable data found"] = "No se ha encontrado información exportable";
-$a->strings["calendar"] = "calendario";
-$a->strings["No contacts in common."] = "Sin contactos en común.";
-$a->strings["Common Friends"] = "Amigos comunes";
-$a->strings["Not available."] = "No disponible";
-$a->strings["%d contact edited."] = array(
-	0 => "%d contacto editado.",
-	1 => "%d contacts edited.",
-);
-$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto.";
-$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado.";
-$a->strings["Contact updated."] = "Contacto actualizado.";
-$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado";
-$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado";
-$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado";
-$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado";
-$a->strings["Contact has been archived"] = "El contacto ha sido archivado";
-$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado";
-$a->strings["Drop contact"] = "Eliminar contacto";
-$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?";
-$a->strings["Contact has been removed."] = "El contacto ha sido eliminado";
-$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s";
-$a->strings["You are sharing with %s"] = "Estás compartiendo con %s";
-$a->strings["%s is sharing with you"] = "%s está compartiendo contigo";
-$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto.";
-$a->strings["(Update was successful)"] = "(La actualización se ha completado)";
-$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)";
-$a->strings["Suggest friends"] = "Sugerir amigos";
-$a->strings["Network type: %s"] = "Tipo de red: %s";
-$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!";
-$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds";
-$a->strings["Fetch information"] = "Recaudar informacion";
-$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves";
-$a->strings["Contact"] = "Contacto";
-$a->strings["Profile Visibility"] = "Visibilidad del Perfil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura.";
-$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas";
-$a->strings["Edit contact notes"] = "Editar notas del contacto";
-$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto";
-$a->strings["Ignore contact"] = "Ignorar contacto";
-$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección";
-$a->strings["View conversations"] = "Ver conversaciones";
-$a->strings["Last update:"] = "Última actualización:";
-$a->strings["Update public posts"] = "Actualizar publicaciones públicas";
-$a->strings["Update now"] = "Actualizar ahora";
-$a->strings["Unignore"] = "Quitar de Ignorados";
-$a->strings["Currently blocked"] = "Bloqueados";
-$a->strings["Currently ignored"] = "Ignorados";
-$a->strings["Currently archived"] = "Archivados";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles.";
-$a->strings["Notification for new posts"] = "Notificacion de nuevos temas.";
-$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto.";
-$a->strings["Blacklisted keywords"] = "Lista negra de palabras";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado";
-$a->strings["Actions"] = "Acciones";
-$a->strings["Contact Settings"] = "Ajustes del contacto";
-$a->strings["Suggestions"] = "Sugerencias";
-$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas";
-$a->strings["Show all contacts"] = "Mostrar todos los contactos";
-$a->strings["Unblocked"] = "Desbloqueados";
-$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear";
-$a->strings["Blocked"] = "Bloqueados";
-$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados";
-$a->strings["Ignored"] = "Ignorados";
-$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados";
-$a->strings["Archived"] = "Archivados";
-$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados";
-$a->strings["Hidden"] = "Ocultos";
-$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos";
-$a->strings["Search your contacts"] = "Buscar en tus contactos";
-$a->strings["Update"] = "Actualizar";
-$a->strings["Archive"] = "Archivo";
-$a->strings["Unarchive"] = "Sin archivar";
-$a->strings["Batch Actions"] = "Accones en lote";
-$a->strings["View all contacts"] = "Ver todos los contactos";
-$a->strings["View all common friends"] = "Ver todos los conocidos en común ";
-$a->strings["Advanced Contact Settings"] = "Configuración avanzada";
-$a->strings["Mutual Friendship"] = "Amistad recíproca";
-$a->strings["is a fan of yours"] = "es tu fan";
-$a->strings["you are a fan of"] = "eres fan de";
-$a->strings["Toggle Blocked status"] = "Cambiar bloqueados";
-$a->strings["Toggle Ignored status"] = "Cambiar ignorados";
-$a->strings["Toggle Archive status"] = "Cambiar archivados";
-$a->strings["Delete contact"] = "Eliminar contacto";
-$a->strings["Global Directory"] = "Directorio global";
-$a->strings["Find on this site"] = "Buscar en este sitio";
-$a->strings["Results for:"] = "Resultados para:";
-$a->strings["Site Directory"] = "Directorio del sitio";
-$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
-$a->strings["People Search - %s"] = "Buscar perfiles - %s";
-$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s";
-$a->strings["No matches"] = "Sin conincidencias";
-$a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
-$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo.";
-$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas.";
-$a->strings["Create New Event"] = "Crea un evento nuevo";
-$a->strings["Event details"] = "Detalles del evento";
-$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo";
-$a->strings["Event Starts:"] = "Inicio del evento:";
-$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante.";
-$a->strings["Event Finishes:"] = "Finalización del evento:";
-$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria";
-$a->strings["Description:"] = "Descripción:";
-$a->strings["Title:"] = "Título:";
-$a->strings["Share this event"] = "Comparte este evento";
-$a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración";
-$a->strings["Could not connect to database."] = "No es posible la conexión con la base de datos.";
-$a->strings["Could not create table."] = "No se puede crear la tabla.";
-$a->strings["Your Friendica site database has been installed."] = "La base de datos de su sitio web de Friendica ha sido instalada.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Puede que tengas que importar el archivo \"Database.sql\" manualmente usando phpmyadmin o mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Por favor, consulta el archivo \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Base de datos ya se encuentra en uso";
-$a->strings["System check"] = "Verificación del sistema";
-$a->strings["Check again"] = "Compruebalo de nuevo";
-$a->strings["Database connection"] = "Conexión con la base de datos";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Con el fin de poder instalar Friendica, necesitamos saber cómo conectar con tu base de datos.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacta con tu proveedor de servicios o con el administrador de la página si tienes alguna pregunta sobre estas configuraciones.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifiques a continuación debería existir ya. Si no es el caso, debes crearla antes de continuar.";
-$a->strings["Database Server Name"] = "Nombre del servidor de la base de datos";
-$a->strings["Database Login Name"] = "Usuario de la base de datos";
-$a->strings["Database Login Password"] = "Contraseña de la base de datos";
-$a->strings["Database Name"] = "Nombre de la base de datos";
-$a->strings["Site administrator email address"] = "Dirección de correo del administrador de la web";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "La dirección de correo de tu cuenta debe coincidir con esta para poder usar el panel de administración de la web.";
-$a->strings["Please select a default timezone for your website"] = "Por favor, selecciona la zona horaria predeterminada para tu web";
-$a->strings["Site settings"] = "Configuración de la página web";
-$a->strings["System Language:"] = "Sistema de idioma:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Seleccione el idioma por defecto para su interfaz de instalación de Friendica y para enviar emails.";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se pudo encontrar una versión de la línea de comandos de PHP en la ruta del servidor web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Si no tienes una versión de command line de php installado en el servidor, no sera posible de efectuar polling como trabajo de fondo a traves de cron. Vea <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
-$a->strings["PHP executable path"] = "Dirección al ejecutable PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introduce la ruta completa al ejecutable php. Puedes dejarlo en blanco y seguir con la instalación.";
-$a->strings["Command line PHP"] = "Línea de comandos PHP";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "El ejecutable PHP no es e lphp cli binary (podria ser versión cgi-fgci)";
-$a->strings["Found PHP version: "] = "Versión PHP encontrada:";
-$a->strings["PHP cli binary"] = "PHP cli binario";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versión en línea de comandos de PHP en tu sistema no tiene \"register_argc_argv\" habilitado.";
-$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error:  La función \"openssl_pkey_new\" en este sistema no es capaz de generar claves de cifrado";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si se ejecuta en Windows, por favor consulta la sección \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generar claves de encriptación";
-$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
-$a->strings["GD graphics PHP module"] = "Módulo PHP gráficos GD";
-$a->strings["OpenSSL PHP module"] = "Módulo PHP OpenSSL";
-$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
-$a->strings["mb_string PHP module"] = "Módulo PHP mb_string";
-$a->strings["mcrypt PHP module"] = "modulo mycrypt PHP";
-$a->strings["XML PHP module"] = "Módulo XML PHP";
-$a->strings["iconv module"] = "Módulo iconv";
-$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite de Apache";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: El módulo de Apache mod-rewrite es necesario pero no está instalado.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El módulo de PHP libcurl es necesario, pero no está instalado.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: El módulo de de PHP gráficos GD con soporte JPEG es necesario, pero no está instalado.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: El módulo de PHP openssl es necesario, pero  no está instalado.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El módulo de PHP mysqli es necesario, pero no está instalado.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: El módulo de PHP mb_string es necesario, pero no está instalado.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: modulo mycrypt PHP requerido pero no instalado.";
-$a->strings["Error: iconv PHP module required but not installed."] = "Error: módulo iconv PHP requerido pero no instalado.";
-$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Si está utilizando php_cli, por favor asegúrese de que el módulo mcrypt está habilitado en este archivo de configuración";
-$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Función mycrypt_create_iv() no esta definido. Esto es preciso para habilitar RINO2 encryption layer.";
-$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() función";
-$a->strings["Error, XML PHP module required but not installed."] = "Error, módulo XML PHP requerido pero no instalado.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El programa de instalación web necesita ser capaz de crear un archivo llamado \".htconfig.php\" en la carpeta principal de tu servidor web y es incapaz de hacerlo.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Se trata a menudo de una configuración de permisos, pues el servidor web puede que no sea capaz de escribir archivos en la carpeta, aunque tú sí puedas.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Al final obtendremos un texto que debes guardar en un archivo llamado .htconfig.php en la carpeta de Friendica.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Como alternativa, puedes saltarte estos pasos y realizar una instalación manual. Por favor, consulta el archivo \"INSTALL.txt\" para las instrucciones.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permiso de escritura";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa el motor de templates Smarty3 para renderizar su visualisacion web. Smarty3 compila templates hacia PHP para acelerar la velocidad del renderizar.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Para poder guardar estos templates compilados, el servidor web necesita acceso de escritura en el directorio /view/smarty3/ en el árbol de raíz de la instalación friendica.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor asegure que el usuario que utiliza el servidor web (ejemplo: www-data) tiene permisos de escritura en esta carpeta.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad deberia dar acceso de escritura solo a /view/smarty3 / → no al los archivos template (.tpl) que contiene.";
-$a->strings["view/smarty3 is writable"] = "Se puede escribir en /view/smarty3";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "La reescritura de la dirección en .htaccess no funcionó. Revisa la configuración.";
-$a->strings["Url rewrite is working"] = "Reescribiendo la dirección...";
-$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extension is installed";
-$a->strings["ImageMagick supports GIF"] = "ImageMagick supporta GIF";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El archivo de configuración de base de datos \".htconfig.php\" no se pudo escribir. Por favor, utiliza el texto adjunto para crear un archivo de configuración en la raíz de tu servidor web.";
-$a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
 $a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original.";
 $a->strings["Empty post discarded."] = "Publicación vacía descartada.";
 $a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado.";
@@ -1706,15 +1716,11 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia
 $a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes.";
 $a->strings["%s posted an update."] = "%s ha publicado una actualización.";
-$a->strings["System down for maintenance"] = "Servicio suspendido por mantenimiento";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado.";
-$a->strings["is interested in:"] = "estás interesado en:";
-$a->strings["Profile Match"] = "Coincidencias de Perfil";
-$a->strings["Warning: This group contains %s member from an insecure network."] = array(
-	0 => "Aviso: este grupo contiene %s contacto con conexión no segura.",
-	1 => "Aviso: este grupo contiene %s contactos con conexiones no seguras.",
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array(
+	0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.",
+	1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.",
 );
-$a->strings["Private messages to this group are at risk of public disclosure."] = "Los mensajes privados a este grupo corren el riesgo de ser mostrados públicamente.";
+$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores.";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente.";
 $a->strings["Invalid contact."] = "Contacto erróneo.";
 $a->strings["Commented Order"] = "Orden de comentarios";
@@ -1777,7 +1783,6 @@ $a->strings["View Album"] = "Ver Álbum";
 $a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo";
 $a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje";
 $a->strings["{0} requested registration"] = "{0} solicitudes de registro";
-$a->strings["Tips for New Members"] = "Consejos para nuevos miembros";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: <br> login: %s<br> contraseña: %s<br><br>Puede cambiar su contraseña después de ingresar al sitio.";
 $a->strings["Registration successful."] = "Registro exitoso.";
@@ -1787,6 +1792,8 @@ $a->strings["You may (optionally) fill in this form via OpenID by supplying your
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos.";
 $a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):";
 $a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?";
+$a->strings["Note for the admin"] = "Nota para el administrador";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo";
 $a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación.";
 $a->strings["Your invitation ID: "] = "ID de tu invitación: ";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Nombre completo (ej. Joe Smith, real o real aparente):";
@@ -1797,16 +1804,6 @@ $a->strings["Confirm:"] = "Confirmar:";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@\$nombredelsitio</strong>\".";
 $a->strings["Choose a nickname: "] = "Escoge un apodo: ";
 $a->strings["Import your profile to this friendica instance"] = "Importar tu perfil a esta instancia de friendica";
-$a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas.";
-$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
-$a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";
-$a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?";
-$a->strings["Delete Video"] = "Borrar vídeo";
-$a->strings["No videos selected"] = "Ningún vídeo seleccionado";
-$a->strings["Recent Videos"] = "Vídeos recientes";
-$a->strings["Upload New Videos"] = "Subir nuevos vídeos";
-$a->strings["No contacts."] = "Ningún contacto.";
 $a->strings["Display"] = "Interfaz del usuario";
 $a->strings["Social Networks"] = "Redes sociales";
 $a->strings["Connected apps"] = "Aplicaciones conectadas";
@@ -1872,6 +1869,8 @@ $a->strings["Move to folder:"] = "Mover al directorio:";
 $a->strings["Display Settings"] = "Configuración Tema/Visualización";
 $a->strings["Display Theme:"] = "Utilizar tema:";
 $a->strings["Mobile Theme:"] = "Tema móvil:";
+$a->strings["Suppress warning of insecure networks"] = "Suprimir el aviso de redes inseguras";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas.";
 $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos";
 $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimo 10 segundos. Ingrese -1 para deshabilitar.";
 $a->strings["Number of items to display per page:"] = "Número de elementos a mostrar por página:";
@@ -1976,6 +1975,17 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ca
 $a->strings["Relocate"] = "Relocalizar";
 $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente  recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)";
 $a->strings["Resend relocate message to contacts"] = "Reenviar mensaje de relocalización a los contactos";
+$a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?";
+$a->strings["Delete Video"] = "Borrar vídeo";
+$a->strings["No videos selected"] = "Ningún vídeo seleccionado";
+$a->strings["Recent Videos"] = "Vídeos recientes";
+$a->strings["Upload New Videos"] = "Subir nuevos vídeos";
+$a->strings["No contacts."] = "Ningún contacto.";
+$a->strings["Invalid request."] = "Consulta invalida";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Disculpa, posiblemente el archivo subido es mas grande que la PHP configuración permite.";
+$a->strings["Or - did you try to upload an empty file?"] = "Si no - intento de subir un archivo vacío?";
+$a->strings["File exceeds size limit of %s"] = "El archivo excede el limite de tamaño de %s";
+$a->strings["File upload failed."] = "Ha fallado la subida del archivo.";
 $a->strings["via"] = "vía";
 $a->strings["Repeat the image"] = "Repetir la imagen";
 $a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo";
@@ -1997,17 +2007,12 @@ $a->strings["Content background transparency"] = "Transparencia de contenido de
 $a->strings["Set the background image"] = "Seleccionar la imagen de fondo";
 $a->strings["Guest"] = "Invitado";
 $a->strings["Visitor"] = "Visitante";
-$a->strings["Set resize level for images in posts and comments (width and height)"] = "Configurar el tamaño de las imágenes en las publicaciones";
-$a->strings["Set font-size for posts and comments"] = "Tamaño del texto para publicaciones y comentarios";
-$a->strings["Set theme width"] = "Establecer el ancho para el tema";
-$a->strings["Color scheme"] = "Esquema de color";
 $a->strings["Alignment"] = "Alineación";
 $a->strings["Left"] = "Izquierda";
 $a->strings["Center"] = "Centrado";
+$a->strings["Color scheme"] = "Esquema de color";
 $a->strings["Posts font size"] = "Tamaño de letra del titulo de las publicaciones";
 $a->strings["Textareas font size"] = "Tamaño de letra del área de texto";
-$a->strings["Set line-height for posts and comments"] = "Altura para las publicaciones y comentarios";
-$a->strings["Set colour scheme"] = "Configurar esquema de color";
 $a->strings["Community Profiles"] = "Perfiles de la Comunidad";
 $a->strings["Last users"] = "Últimos usuarios";
 $a->strings["Find Friends"] = "Buscar amigos";
@@ -2018,18 +2023,6 @@ $a->strings["Comma separated list of helper forums"] = "Lista separada por comas
 $a->strings["Set style"] = "Definir estilo";
 $a->strings["Community Pages"] = "Páginas de Comunidad";
 $a->strings["Help or @NewHere ?"] = "¿Ayuda o @NuevoAquí?";
-$a->strings["Your contacts"] = "Tus contactos";
-$a->strings["Your personal photos"] = "Tus fotos personales";
-$a->strings["Last likes"] = "Últimos \"me gusta\"";
-$a->strings["Last photos"] = "Últimas fotos";
-$a->strings["Earth Layers"] = "Minimapa";
-$a->strings["Set zoomfactor for Earth Layers"] = "Configurar zoom en Minimapa";
-$a->strings["Set longitude (X) for Earth Layers"] = "Configurar longitud (X) en Minimapa";
-$a->strings["Set latitude (Y) for Earth Layers"] = "Configurar latitud (Y) en Minimapa";
-$a->strings["Show/hide boxes at right-hand column:"] = "Mostrar/Ocultar casillas en la columna derecha:";
-$a->strings["Set resolution for middle column"] = "Resolución para la columna central";
-$a->strings["Set color scheme"] = "Configurar esquema de color";
-$a->strings["Set zoomfactor for Earth Layer"] = "Establecer zoom para Minimapa";
 $a->strings["greenzero"] = "greenzero";
 $a->strings["purplezero"] = "purplezero";
 $a->strings["easterbunny"] = "easterbunny";

view/templates/admin_summary.tpl

@@ -1,6 +1,13 @@
 
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
+{{if $showwarning}}
+	<div id="admin-warning-message-wrapper">
+		{{foreach $warningtext as $wt}}
+		<p class="warning-message">{{$wt}}</p>
+		{{/foreach}}
+	</div>
+{{/if}}
 
 	<dl>
 		<dt>{{$queues.label}}</dt>

view/templates/admin_users.tpl

@@ -39,6 +39,9 @@
 						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
 					</td>
 				</tr>
+				<tr>
+					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
+				</tr>
 			{{/foreach}}
 				</tbody>
 			</table>

view/templates/register.tpl

@@ -57,6 +57,10 @@
 	</div>
 	<div id="register-nickname-end" ></div>
 
+{{if $permonly}}
+    {{include file="field_textarea.tpl" field=$permonlybox}}
+{{/if}}
+
 	{{$publish}}
 
 	<div id="register-submit-wrapper">

view/templates/settings_display.tpl

@@ -9,6 +9,7 @@
 {{include file="field_themeselect.tpl" field=$mobile_theme}}
 {{include file="field_input.tpl" field=$itemspage_mobile_network}}
 {{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_checkbox.tpl" field=$nowarn_insecure}}
 {{include file="field_checkbox.tpl" field=$no_auto_update}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
 {{include file="field_checkbox.tpl" field=$noinfo}}

view/templates/wall_thread.tpl

@@ -64,8 +64,8 @@
 		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
 			{{if $item.vote}}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+				<a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
 				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0|escape:'html'}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
 				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape:'html'}}" title="{{$item.wait|escape:'html'}}" style="display: none;" />
 			</div>
@@ -88,9 +88,9 @@
 			{{/if}}
 			{{if $item.isevent }}
 			<div class="wall-item-attend-wrapper">
-				<a href="#" id="attendyes-{{$item.id}}" class="icon attendyes" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
-				<a href="#" id="attendno-{{$item.id}}" class="icon attendno"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
-				<a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
+				<a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
+				<a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
+				<a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
 			</div>
 			{{/if}}
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >

view/theme/cleanzero/cleanzero-green/style.css

@@ -1,127 +0,0 @@
-@import url('../greenzero/style.css');
-body {background-image:none;
-
-}
-
-.wall-item-content-wrapper {
-	  border-top: 1px solid #ccc;
-//border-top:none;
-border-left:none;
-border-right:none;
-border-radius:0px;
-//border:none;
-	//background: #f8f8f8 !important;
-}
-
-.wall-item-content-wrapper.comment {
-	// background: #f8f8f8 !important;
-	// border-left: 1px solid #ccc;
-	 border-top: 1px solid #ccc;
-border-left:none;
-border-right:none;
-border-radius:0px;
- }
-
- .wall-item-tools {
-// border-top: 1px solid #ccc;	
-//  background: #f8f8f8 !important;
-background: #ffffff !important;
- }
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: 1px solid #ccc;
-	border-left: 1px solid #EEE;
-	background: #ffffff;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	// background: #ffffff; !important;
-//background: #f8f8f8 !important;
-}
-
-
-
-
-
-section {
-	 margin: 0px 10%;
-margin-right:12%;
-	background-image:none;
-}
-
-aside {
-	margin-left: 10%;
-	background-image:none;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 5%;
-
-}
-
-nav #site-location {
-	top: 80px;
-	right: 5%;
-
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-
-.tabs {	background-image:none; 
-
-}
-.tab.active {
-	padding: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
-	border: 1px solid #CCCCCC;
-	//background: #F8F8F8;
-	font-weight: bold;
-}
-.tab { margin-right: 1px ;
-
-}
-
-#group-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#nets-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#saved-search-list {
-	border:none;
-}
-blockquote {
-	//background-color: #f8f8f8;
-	border: 1px solid #ccc;
-	-moz-border-radius: 3px;
-	
-	border-radius: 3px;
-}
-.widget { 
-border: none;
-}
-
-
-.wall-item-content {
-max-height: 20000px;
-overflow: none;
-}
-
-.nav-commlink, .nav-login-link {
-margin-top: 67px;
-height: 15px;
-float:left;
-padding: 6px 3px;
-}
-
-nav .nav-link {
-	//float: left;
-}

view/theme/cleanzero/cleanzero-purple/style.css

@@ -1,127 +0,0 @@
-@import url('../purplezero/style.css');
-body {background-image:none;
-
-}
-
-.wall-item-content-wrapper {
-	  border-top: 1px solid #ccc;
-//border-top:none;
-border-left:none;
-border-right:none;
-border-radius:0px;
-//border:none;
-	//background: #f8f8f8 !important;
-}
-
-.wall-item-content-wrapper.comment {
-	// background: #f8f8f8 !important;
-	// border-left: 1px solid #ccc;
-	 border-top: 1px solid #ccc;
-border-left:none;
-border-right:none;
-border-radius:0px;
- }
-
- .wall-item-tools {
-// border-top: 1px solid #ccc;	
-//  background: #f8f8f8 !important;
-background: #ffffff !important;
- }
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: 1px solid #ccc;
-	border-left: 1px solid #EEE;
-	background: #ffffff;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	// background: #ffffff; !important;
-// background: #f8f8f8 !important;
-}
-
-
-
-
-
-section {
-	 margin: 0px 10%;
-margin-right:12%;
-	background-image:none;
-}
-
-aside {
-	margin-left: 10%;
-	background-image:none;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 5%;
-
-}
-
-nav #site-location {
-	top: 80px;
-	right: 5%;
-
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-
-.tabs {	background-image:none; 
-
-}
-.tab.active {
-	padding: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
-	border: 1px solid #CCCCCC;
-	// background: #F8F8F8;
-	font-weight: bold;
-}
-.tab { margin-right: 1px ;
-
-}
-
-#group-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#nets-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#saved-search-list {
-	border:none;
-}
-blockquote {
-	background-color: #f8f8f8;
-	border: 1px solid #ccc;
-	-moz-border-radius: 3px;
-	
-	border-radius: 3px;
-}
-.widget { 
-border: none;
-}
-
-
-.wall-item-content {
-max-height: 20000px;
-overflow: none;
-}
-
-.nav-commlink, .nav-login-link {
-margin-top: 67px;
-height: 15px;
-float:left;
-padding: 6px 3px;
-}
-
-nav .nav-link {
-	//float: left;
-}

view/theme/cleanzero/cleanzero/style.css

@@ -1,127 +0,0 @@
-@import url('../duepuntozero/style.css');
-body {background-image:none;
-
-}
-
-.wall-item-content-wrapper {
-	  border-top: 1px solid #ccc;
-//border-top:none;
-border-left:none;
-border-right:none;
-border-radius:0px;
-//border:none;
-	//background: #f8f8f8 !important;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #f8f8f8 !important;
-	// border-left: 1px solid #ccc;
-	 border-top: 1px solid #ccc;
-border-left:none;
-border-right:none;
-border-radius:0px;
- }
-
- .wall-item-tools {
-// border-top: 1px solid #ccc;	
-//  background: #f8f8f8 !important;
-background: #ffffff !important;
- }
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: 1px solid #ccc;
-	border-left: 1px solid #EEE;
-	background: #ffffff;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	// background: #ffffff; !important;
-background: #f8f8f8 !important;
-}
-
-
-
-
-
-section {
-	 margin: 0px 10%;
-margin-right:12%;
-	background-image:none;
-}
-
-aside {
-	margin-left: 10%;
-	background-image:none;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 5%;
-
-}
-
-nav #site-location {
-	top: 80px;
-	right: 5%;
-
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-
-.tabs {	background-image:none; 
-
-}
-.tab.active {
-	padding: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
-	border: 1px solid #CCCCCC;
-	background: #F8F8F8;
-	font-weight: bold;
-}
-.tab { margin-right: 1px ;
-
-}
-
-#group-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#nets-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#saved-search-list {
-	border:none;
-}
-blockquote {
-	background-color: #f8f8f8;
-	border: 1px solid #ccc;
-	-moz-border-radius: 3px;
-	
-	border-radius: 3px;
-}
-.widget { 
-border: none;
-}
-
-
-.wall-item-content {
-max-height: 20000px;
-overflow: none;
-}
-
-.nav-commlink, .nav-login-link {
-margin-top: 67px;
-height: 15px;
-float:left;
-padding: 6px 3px;
-}
-
-nav .nav-link {
-	//float: left;
-}

view/theme/cleanzero/config.php

@@ -1,89 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
-	$color = get_pconfig(local_user(), 'cleanzero', 'color' );
-       $font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
-	$theme_width= get_pconfig(local_user(), 'cleanzero', 'theme_width' );
-	
-	return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['cleanzero-settings-submit'])){
-		set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);	
-		set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
-		set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
-		set_pconfig(local_user(), 'cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
-	}
-}
-
-
-function theme_admin(&$a){
-	$resize = get_config('cleanzero', 'resize' );
-	$color = get_config('cleanzero', 'color' );
-	$font_size = get_config('cleanzero', 'font_size' );
-	$theme_width= get_config('cleanzero', 'theme_width' );
-	return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['cleanzero-settings-submit'])){
-		set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
-		set_config('cleanzero', 'color', $_POST['cleanzero_color']);
-		set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
-		set_config('cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
-
-	}
-}
-
-
-function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
-	$colors = array(
-		"cleanzero"=>"cleanzero", 
-		"cleanzero-green"=>"green",
-		"cleanzero-purple"=>"purple"
-	);
-	$font_sizes = array(
-		'12'=>'12',
-		"---"=>"---",
-		"16"=>"16",		
-		"14"=>"14",
-		'10'=>'10',
-		);
-	$resizes = array(
-		"0"=>"0 (no resizing)",
-		"600"=>"1 (600px)",
-		"300"=>"2 (300px)",
-		"250"=>"3 (250px)",
-		"150"=>"4 (150px)",
-	       );
-	$theme_widths =array (
-		"standard"=>"standard",
-		"narrow"=>"narrow",
-		"wide"=>"wide",
-		);
-
-	$t = get_markup_template("theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
-		'$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$theme_width' => array('cleanzero_theme_width', t('Set theme width'), $theme_width, '', $theme_widths),
-		'$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
-	));
-	return $o;
-}

view/theme/cleanzero/js/jquery.ae.image.resize.js

@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );

view/theme/cleanzero/js/jquery.ae.image.resize.min.js

@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);

view/theme/cleanzero/style.css

@@ -1,127 +0,0 @@
-@import url('../duepuntozero/style.css');
-body {background-image:none;
-
-}
-
-.wall-item-content-wrapper {
-	  border-top: 1px solid #ccc;
-//border-top:none;
-border-left:none;
-border-right:none;
-border-radius:0px;
-//border:none;
-	//background: #f8f8f8 !important;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #f8f8f8 !important;
-	// border-left: 1px solid #ccc;
-	 border-top: 1px solid #ccc;
-border-left:none;
-border-right:none;
-border-radius:0px;
- }
-
- .wall-item-tools {
-// border-top: 1px solid #ccc;	
-//  background: #f8f8f8 !important;
-background: #ffffff !important;
- }
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: 1px solid #ccc;
-	border-left: 1px solid #EEE;
-	background: #ffffff;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	// background: #ffffff; !important;
-background: #f8f8f8 !important;
-}
-
-
-
-
-
-section {
-	 margin: 0px 10%;
-margin-right:12%;
-	background-image:none;
-}
-
-aside {
-	margin-left: 10%;
-	background-image:none;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 5%;
-
-}
-
-nav #site-location {
-	top: 80px;
-	right: 5%;
-
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-}
-
-.tabs {	background-image:none; 
-
-}
-.tab.active {
-	padding: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;	
-	border: 1px solid #CCCCCC;
-	background: #F8F8F8;
-	font-weight: bold;
-}
-.tab { margin-right: 1px ;
-
-}
-
-#group-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#nets-sidebar {
-	margin-bottom: 10px;
-	border:none;
-}
-
-#saved-search-list {
-	border:none;
-}
-blockquote {
-	background-color: #f8f8f8;
-	border: 1px solid #ccc;
-	-moz-border-radius: 3px;
-	
-	border-radius: 3px;
-}
-.widget { 
-border: none;
-}
-
-
-.wall-item-content {
-max-height: 20000px;
-overflow: none;
-}
-
-.nav-commlink, .nav-login-link {
-margin-top: 67px;
-height: 15px;
-float:left;
-padding: 6px 3px;
-}
-
-nav .nav-link {
-	//float: left;
-}

view/theme/cleanzero/style.php

@@ -1,140 +0,0 @@
-<?php
-	$color=false;
-	$cleanzero_font_size=false;
-	$cleanzero_theme_width=false;
-
-	$site_color = get_config("cleanzero","color");
-	$site_cleanzero_font_size = get_config("cleanzero", "font_size" );
-	$site_cleanzero_theme_width = get_config("cleanzero", "theme_width");
-	
-	if (local_user()) {
-		$color = get_pconfig(local_user(), "cleanzero","color");
-		$cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
-		$cleanzero_theme_width = get_pconfig(local_user(), "cleanzero", "theme_width");
-	
-	}
-	
-	if ($color===false) $color=$site_color;
-	if ($color===false) $color="cleanzero";
-	if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
-	if ($cleanzero_theme_width===false) $cleanzero_theme_width=$site_cleanzero_theme_width;
-	if ($cleanzero_theme_width===false) $cleanzero_theme_width="standard";
-	
-		
-	if (file_exists("$THEMEPATH/$color/style.css")){
-		echo file_get_contents("$THEMEPATH/$color/style.css");
-	}
-
-
-
-	if($cleanzero_font_size == "16"){
-		echo "
-			.wall-item-content-wrapper {
-  					font-size: 16px;
-  					}
-  					
-			.wall-item-content-wrapper.comment {
-  					font-size: 16px;
-  					}
-		";  
-       }
-       if($cleanzero_font_size == "14"){
-		echo "
-			.wall-item-content-wrapper {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-content-wrapper.comment {
-  					font-size: 14px;
-  					}
-		";
-	}	
-	if($cleanzero_font_size == "12"){
-		echo "
-			.wall-item-content-wrapper {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-content-wrapper.comment {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($cleanzero_font_size == "10"){
-		echo "
-			.wall-item-content-wrapper {
-  					font-size: 10px;
-  					}
-  					
-			.wall-item-content-wrapper.comment {
-  					font-size: 10px;
-  					}
-		";
-	}
-	if ($cleanzero_theme_width === "standard") {
-		echo "
-                     section {
-	                margin: 0px 10%;
-                       margin-right:10%;
-                       }
-
-                     aside {
-	                margin-left: 10%;
-                      }
-                     nav {
-	                margin-left: 10%;
-	                margin-right: 10%;
-
-                      }
-
-                     nav #site-location {
-	                right: 10%;
-
-                      }
-		";
-	}
-
-	if ($cleanzero_theme_width === "narrow") {
-		echo "
-                     section {
-	                margin: 0px 15%;
-                       margin-right:15%;
-                       }
-
-                     aside {
-	                margin-left: 15%;
-                      }
-                     nav {
-	                margin-left: 15%;
-	                margin-right: 15%;
-
-                      }
-
-                     nav #site-location {
-	                right: 15%;
-
-                      }
-		";
-	}
-	if ($cleanzero_theme_width === "wide") {
-		echo "
-                     section {
-	                margin: 0px 5%;
-                       margin-right:5%;
-                       }
-
-                     aside {
-	                margin-left: 5%;
-                      }
-                     nav {
-	                margin-left: 5%;
-	                margin-right: 5%;
-
-                      }
-
-                     nav #site-location {
-	                right: 5%;
-
-                      }
-		";
-	}

view/theme/cleanzero/templates/nav.tpl

@@ -1,86 +0,0 @@
-
- <nav>
-	{{$langselector}}
-
-	<div id="site-location">{{$sitelocation}}</div>
-
-
-	<span id="nav-commlink-wrapper">
-
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
-		
-
-
-	{{if $nav.network}}
-	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.home}}
-	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.community}}
-	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-	{{/if}}
-	{{if $nav.introductions}}
-	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{/if}}
-	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{/if}}
-		{{if $nav.notifications}}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.3}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-		{{/if}}	
-	</span>
-       <span id="banner">{{$banner}}</span>
-	<span id="nav-link-wrapper">
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
-		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
-
-	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
-
-	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
-
-
-
-	
-
-	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
-
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
-
-
-	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
-	</span>
-	<span id="nav-end"></span>
-	
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>

view/theme/cleanzero/templates/theme_settings.tpl

@@ -1,11 +0,0 @@
-
-{{include file="field_select.tpl" field=$color}}
-{{include file="field_select.tpl" field=$font_size}}
-{{include file="field_select.tpl" field=$resize}}
-{{include file="field_select.tpl" field=$theme_width}}
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="cleanzero-settings-submit" />
-</div>
-

view/theme/cleanzero/theme.php

@@ -1,126 +0,0 @@
-<?php
-/*
- * Name: cleanzero
- * Description: Theme with clean design derived from the zero theme family. Including options to set color schemes, font sizes and resizing of images in posts 
- * Version:
- * Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
- */
-
-function cleanzero_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'duepuntozero',
-);
-set_template_engine($a, 'smarty3');
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
-function cmtBbOpen(comment, id) {
-	if($(comment).hasClass('comment-edit-text-full')) {
-		$(".comment-edit-bb-" + id).show();
-		return true;
-	}
-	return false;
-}
-function cmtBbClose(comment, id) {
-//	if($(comment).hasClass('comment-edit-text-empty')) {
-//		$(".comment-edit-bb-" + id).hide();
-//		return true;
-//	}
-	return false;
-}
-
-
-$(document).ready(function() {
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
-
-});
-
-
-</script>
-EOT;
-// get resize configuration
-
-$resize=false;
-$site_resize = get_config('cleanzero', 'resize' );
-if(local_user()) $resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
-
-if ($resize===false) $resize=$site_resize;
-if ($resize===false) $resize=0;
-
-if (intval($resize) > 0) {
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/cleanzero/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".wall-item-content  img").aeImageResize({height: '.$resize.', width: '.$resize.'});
-  });
-</script>';}
-}

view/theme/comix-plain/style.css

@@ -1,105 +0,0 @@
-@import url('../duepuntozero/style.css');
-
-.wall-item-content-wrapper {
-	border: none;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #ffffff !important;
-	border-left: 1px solid #EEE;
-}
-
-.wall-item-tools {
-	background: none;
-}
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: none;
-	border-left: 1px solid #EEE;
-	background: #EEEEEE;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	background: #ffffff !important;
-}
-
-section {
-	margin: 0px 32px;
-}
-
-aside {
-	margin-left: 32px;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 32px;
-}
-
-nav #site-location {
-	top: 80px;
-	right: 36px;
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	margin-top: 15px;
-}
-
-.wall-item-photo.comment {
-	margin-top: 26px;
-}
-
-
-.triangle-isosceles {
-	position:relative;
-	padding:15px;
-	margin:1em 0 3em;
-	color:#000;
-	background:#EEEEEE; /* default background for browsers without gradient support */
-	/* css3 */
-	background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff));
-	background:-moz-linear-gradient(#EEEEEE, #ffffff);
-	background:-o-linear-gradient(#EEEEEE, #ffffff);
-	background:linear-gradient(#EEEEEE, #ffffff);
-	-webkit-border-radius:10px;
-	-moz-border-radius:10px;
-	border-radius:10px;
-}
-
-/* Variant : for left/right positioned triangle
------------------------------------------- */
-
-.triangle-isosceles.left {
-	margin-left:30px;
-	background:#F8F8F8;
-	border: 2px solid #CCCCCC;
-}
-
-/* THE TRIANGLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-/* creates triangle */
-.triangle-isosceles:after {
-	content:"";
-	position:absolute;
-	bottom:-8px; /* value = - border-top-width - border-bottom-width */
-	left:30px; /* controls horizontal position */
-	border-width:15px 15px 0; /* vary these values to change the angle of the vertex */
-	border-style:solid;
-	border-color:#f8f8f8 transparent;
-    /* reduce the damage in FF3.0 */
-    display:block; 
-    width:0;
-}
-
-/* Variant : left
------------------------------------------- */
-
-.triangle-isosceles.left:after {
-	top:12px; /* controls vertical position */
-	left:-30px; /* value = - border-left-width - border-right-width */
-	bottom:auto;
-	border-width:10px 30px 10px 0;
-	border-color:transparent #f8f8f8;
-}

view/theme/comix-plain/templates/comment_item.tpl

@@ -1,34 +0,0 @@
-
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>

view/theme/comix-plain/templates/search_item.tpl

@@ -1,55 +0,0 @@
-
-<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-
-

view/theme/comix-plain/theme.php

@@ -1,64 +0,0 @@
-<?php
-
-/*
- * Name: Comix-Plain
- * Description: Comix theme with a standard font
- * Version: 1.0
- * Author: Mike Macgirvin <mike@macgirvin.com>
- */
-
-
-function comix_plain_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'duepuntozero',
-);
-set_template_engine($a, 'smarty3');
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
-
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
-
-});
-
-
-</script>
-EOT;
-}
-

view/theme/comix/style.css

@@ -1,109 +0,0 @@
-@import url('../duepuntozero/style.css');
-
-body {
-	font-family: "Comic Sans MS", sans !important;
-	font-size: 13px;
-}
-.wall-item-content-wrapper {
-	border: none;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #ffffff !important;
-	border-left: 1px solid #EEE;
-}
-
-.wall-item-tools {
-	background: none;
-}
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border: none;
-	border-left: 1px solid #EEE;
-	background: #EEEEEE;
-}
-
-.comment-edit-wrapper, .comment-wwedit-wrapper {
-	background: #ffffff !important;
-}
-
-section {
-	margin: 0px 32px;
-}
-
-aside {
-	margin-left: 32px;
-}
-nav {
-	margin-left: 32px;
-	margin-right: 32px;
-}
-
-nav #site-location {
-	top: 80px;
-	right: 36px;
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	margin-top: 15px;
-}
-
-.wall-item-photo.comment {
-	margin-top: 26px;
-}
-
-
-.triangle-isosceles {
-	position:relative;
-	padding:15px;
-	margin:1em 0 3em;
-	color:#000;
-	background:#EEEEEE; /* default background for browsers without gradient support */
-	/* css3 */
-	background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff));
-	background:-moz-linear-gradient(#EEEEEE, #ffffff);
-	background:-o-linear-gradient(#EEEEEE, #ffffff);
-	background:linear-gradient(#EEEEEE, #ffffff);
-	-webkit-border-radius:10px;
-	-moz-border-radius:10px;
-	border-radius:10px;
-}
-
-/* Variant : for left/right positioned triangle
------------------------------------------- */
-
-.triangle-isosceles.left {
-	margin-left:30px;
-	background:#F8F8F8;
-	border: 2px solid #CCCCCC;
-}
-
-/* THE TRIANGLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-/* creates triangle */
-.triangle-isosceles:after {
-	content:"";
-	position:absolute;
-	bottom:-8px; /* value = - border-top-width - border-bottom-width */
-	left:30px; /* controls horizontal position */
-	border-width:15px 15px 0; /* vary these values to change the angle of the vertex */
-	border-style:solid;
-	border-color:#f8f8f8 transparent;
-    /* reduce the damage in FF3.0 */
-    display:block; 
-    width:0;
-}
-
-/* Variant : left
------------------------------------------- */
-
-.triangle-isosceles.left:after {
-	top:12px; /* controls vertical position */
-	left:-30px; /* value = - border-left-width - border-right-width */
-	bottom:auto;
-	border-width:10px 30px 10px 0;
-	border-color:transparent #f8f8f8;
-}

view/theme/comix/templates/comment_item.tpl

@@ -1,34 +0,0 @@
-
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-				<input type="hidden" name="type" value="{{$type}}" />
-				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-				<input type="hidden" name="parent" value="{{$parent}}" />
-				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
-				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
-				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
-				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
-					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-				{{if $qcomment}}
-				{{foreach $qcomment as $qc}}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
-					&nbsp;
-				{{/foreach}}
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>

view/theme/comix/templates/search_item.tpl

@@ -1,55 +0,0 @@
-
-<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
-				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
-				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
-
-</div>
-
-

view/theme/comix/theme.php

@@ -1,64 +0,0 @@
-<?php
-
-/*
- * Name: Comix
- * Description: An irreverent theme
- * Version: 1.0
- * Author: Mike Macgirvin <mike@macgirvin.com>
- */
-
-
-function comix_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'duepuntozero',
-);
-set_template_engine($a, 'smarty3');
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
-
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
-
-});
-
-
-</script>
-EOT;
-}
-

view/theme/darkbubble/style.css

@@ -1,33 +0,0 @@
-@import url('../testbubble/style.css');
-
-.icon {
-	background-image: url('dbicons.png');
-}
-
-body {
-	background: #000000;
-	color: #dddddd;
-}
-
-.info-message {
-	color: #444444;
-}
-
-#id_openid_url {
-	background: url(../testbubble/login-bg.gif) no-repeat #ffffff;
-	background-position: 0 50%;
-	padding-left: 18px;
-	width: 385px;
-	color: #000000;
-}
-
-.vevent, .eventcal {
-	color: #000000;
-}
-.event-list-date {
-	color: #DDDDDD;
-}
-
-.fortunate {
-	color: #8888FF !important;
-}

view/theme/darkbubble/theme.php

@@ -1,25 +0,0 @@
-<?php
-
-/*
- * Name: Dark Bubble
- * Version: 1.0
- * Maintainer: Mike Macgirvin <mike@macgirvin.com>
- */
-
-
-function darkbubble_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'testbubble',
-);
-set_template_engine($a, 'smarty3');
-
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
-
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-});
-</script>
-EOT;
-}

view/theme/darkzero-NS/style.css

@@ -1,183 +0,0 @@
-@import url('../duepuntozero/style.css');
-
-/* dark variation Fabio Comuni <fabrix.xm@gmail.com> */
-
-a:link, a:visited { color: #99CCFF; text-decoration: none; }
-a:hover {text-decoration: underline; }
-
-input, select, textarea {
-	background-color: #222222;
-	color: #FFFFFF !important;
-	border: 1px solid #444444;
-}
-.openid { background-color: #222222;}
-
-body { 	background-color: #222222; color: #cccccc; background-image: url(head.jpg); }
-aside{ 	background-image: url(border.jpg); padding-bottom: 0px; }
-section { background-color: #333333;	background-image: url(border.jpg); }
-
-
-.tabs {	background-image: url(head.jpg); }
-div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
-
-nav #banner #logo-text a { color: #ffffff; }
-
-.wall-item-content-wrapper { 
-border: 1px solid #444444; 
-background: #444;  
-
-}
-.wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{ background-color: #333333; }
-.comment-edit-preview{ color: #000000; }
-.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
-.photo-top-album-name{ background-color: #333333; }
-.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
-
-.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px}
-.nav-commlink, .nav-login-link {background-color: #b7bab3;}
-.nav-commlink:link, .nav-commlink:visited,
-.nav-login-link:link, .nav-login-link:visited{
-	color: #ffffff;
-}
-
-.fakelink, .fakelink:visited {
-	color: #99CCFF;
-}
-
-.wall-item-name-link {
-	color: #99CCFF;
-}
-
-.wall-item-photo-menu li a, .contact-photo-menu {
-	color: #CCCCCC; background-color: #333333;
-}
-
-.wall-item-photo-menu li a:hover {
-	background-color: #CCCCCC; color: #333333;
-}
-#page-footer { min-height: 1em;}
-footer {
-	margin: 0px 10%;
-	display: block;
-	background-image: url('sectionend.jpg');
-	background-position: top left;
-	background-repeat: repeat-x;
-	height: 25px;	
-}
-
-
-input#dfrn-url {
-	background-color: #222222;
-	color: #FFFFFF !important;
-}
-.pager_first a, .pager_last a, .pager_prev a, .pager_next a, .pager_n a, .pager_current {
-    color: #000088;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-
-#jot-title, #jot-category {
-	background-color: #333333;
-	border: 1px solid #333333;
-}
-
-#jot-title::-webkit-input-placeholder{ color: #555555!important;}
-#jot-title:-moz-placeholder{color: #555555!important;}
-#jot-category::-webkit-input-placeholder{ color: #555555!important;}
-#jot-category:-moz-placeholder{color: #555555!important;}
-		
-	
-#jot-title:hover,
-#jot-title:focus,
-#jot-category:hover,
-#jot-category:focus {
-	border: 1px solid #cccccc; 
-}
-blockquote {
-	background: #ddd;
-	color: #000;
-}
-
-.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
-        color: #eec;
-}
-
-input#acl-search {
-        background-color: #aaa;
-}
-
-
-
-.notify-seen {
-  background:#111;
-}
-
-#nav-notifications-menu {
-  background: #2e2e2f;
-}
-
-#nav-notifications-menu li:hover {
-  background: #444;
-}
-
-.acpopupitem{
-  background:#2e2f2e;
-}
-
-code {
-  background:#2e2f2e !important;
-  color:#fff !important;
-}
-
-blockquote {
-  background:#2e2f2e !important;
-  color:#eec !important;
-}
-
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
-  background:#2e2f2e;
-}
-
-#fancybox-content{
-  background:#444;
-}
-
-.wall-item-content {
-	max-height: 20000px;
-	overflow: none;
-}
-
-.editicon {
-	background-color: #333;
-}
-
-#datebrowse-sidebar select {
-color:#99CCFF !important;
-}
-
-.settings-widget .selected {
-background: #666;
-}
-
-#adminpage table tr:hover {
-    color: #eec;
-    background-color: #666;
-}
-
-input#prvmail-subject {
-background: #222 !important;
-}
-
-/* Events */
-
-.fc-state-highlight {
-background: #666 !important;
-}
- 
-.fc-state-disabled, .fc-state-disabled .fc-button-inner {
-color: #000 !important;
-}

view/theme/darkzero-NS/theme.php

@@ -1,97 +0,0 @@
-<?php
-
-/*
- * Name: Darkzero-NS
- * Description: Darkzero theme with posts that do not scroll
- * Version: 1.0
- * Author: Mike Macgirvin <mike@macgirvin.com>
- */
-
-function darkzero_NS_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'duepuntozero',
-);
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
-}
-$(document).ready(function() {
-
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
-
-});
-
-
-</script>
-EOT;
-}

view/theme/darkzero/style.css

@@ -1,189 +0,0 @@
-@import url('../duepuntozero/style.css');
-
-/* dark variation Fabio Comuni <fabrix.xm@gmail.com> */
-
-a:link, a:visited { color: #99CCFF; text-decoration: none; }
-a:hover {text-decoration: underline; }
-
-input, select, textarea {
-	background-color: #222222;
-	color: #FFFFFF !important;
-	border: 1px solid #444444;
-}
-.openid { background-color: #222222;}
-
-body { 	background-color: #222222; color: #cccccc; background-image: url(head.jpg); }
-aside{ 	background-image: url(border.jpg); padding-bottom: 0px; }
-section { background-color: #333333;	background-image: url(border.jpg); }
-#panel { background-color: #2e2f2e;}
-
-.tabs {	background-image: url(head.jpg); }
-div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
-
-nav #banner #logo-text a { color: #ffffff; }
-
-.wall-item-content-wrapper { 
-	border: 1px solid #444444; 
-	background: #444444;  
-}
-.wall-item-outside-wrapper.threaded > .wall-item-content-wrapper {
-	-moz-border-radius: 3px 3px 0px;
-	border-radius: 3px 3px 0px;	
-}
-.wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{
-	background-color: #333333;
-}
-.comment-wwedit-wrapper.threaded {
-	border: solid #444444;
-	border-width: 0px 3px 3px;
-	-moz-border-radius: 0px 0px 3px 3px;
-	border-radius: 0px 0px 3px 3px;	
-}
-.editicon {
-    	background-color: #333;
-}
-.comment-edit-preview{ color: #000000; }
-.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
-.photo-top-album-name{ background-color: #333333; }
-.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
-
-.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px}
-.nav-commlink, .nav-login-link {background-color: #b7bab3;}
-.nav-commlink:link, .nav-commlink:visited,
-.nav-login-link:link, .nav-login-link:visited{
-	color: #ffffff;
-}
-
-.fakelink, .fakelink:visited {
-	color: #99CCFF;
-}
-
-.wall-item-name-link {
-	color: #99CCFF;
-}
-
-.wall-item-photo-menu li a, .contact-photo-menu {
-	color: #CCCCCC; background-color: #333333;
-}
-
-.wall-item-photo-menu li a:hover {
-	background-color: #CCCCCC; color: #333333;
-}
-
-code {
-  background:#2e2f2e !important;
-  color:#fff !important;
-}
-
-blockquote {
-  background:#2e2f2e !important;
-  color:#eec !important;
-}
-
-
-#page-footer { min-height: 1em;}
-footer {
-	margin: 0px 10%;
-	display: block;
-	background-image: url('sectionend.jpg');
-	background-position: top left;
-	background-repeat: repeat-x;
-	height: 25px;	
-}
-
-
-input#dfrn-url {
-	background-color: #222222;
-	color: #FFFFFF !important;
-}
-.pager_first a, .pager_last a, .pager_prev a, .pager_next a, .pager_n a, .pager_current {
-    color: #000088;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-
-#jot-title, #jot-category {
-	background-color: #333333;
-	border: 1px solid #333333;
-}
-
-#jot-title::-webkit-input-placeholder{ color: #555555!important;}
-#jot-title:-moz-placeholder{color: #555555!important;}
-#jot-category::-webkit-input-placeholder{ color: #555555!important;}
-#jot-category:-moz-placeholder{color: #555555!important;}
-		
-	
-#jot-title:hover,
-#jot-title:focus,
-#jot-category:hover,
-#jot-category:focus {
-	border: 1px solid #cccccc; 
-}
-
-.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
-        color: #eec;
-}
-#fancybox-content{
-  background:#444;
-}
-
-input#acl-search {
-        background-color: #aaa;
-}
-
-
-.notify-seen {
-  background:#111;
-}
-
-#nav-notifications-menu {
-  background: #2e2e2f;
-}
-
-#nav-notifications-menu li:hover {
-  background: #444;
-}
-
-.acpopupitem{
-  background:#2e2f2e;
-}
-
-.group-selected, .nets-selected, .fileas-selected, .categories-selected{
-  background:#2e2f2e;
-}
-
-/* Events */
-
-.fc-state-highlight {
-background: #666 !important;
-}
-
-.fc-state-disabled, .fc-state-disabled .fc-button-inner {
-color: #000 !important;
-}
-
-/*Admin page */
-
-#adminpage table tr:hover {
-    color: #eec;
-    background-color: #666;
-}
-
-.settings-widget .selected {
-background: #666;
-}
-
-
-/* Stuff that doesn't seem to fit with anything else */
-
-#datebrowse-sidebar select {
-color:#99CCFF !important;
-}
-
-input#prvmail-subject {
-background: #222 !important;
-}

view/theme/darkzero/theme.php

@@ -1,108 +0,0 @@
-<?php
-
-/*
- * Name: Darkzero
- * Version: 1.0
- * Author: Fabio Communi <fabrix.xm@gmail.com>
- * Maintainer: Fabio Communi <fabrix.xm@gmail.com>
- * Maintainer: Mike Macgirvin <mike@macgirvin.com>
- */
-
-function darkzero_init(&$a) {
-$a->theme_info = array(
-  'extends' => 'duepuntozero',
-);
-set_template_engine($a, 'smarty3');
-
-$a->page['htmlhead'] .= <<< EOT
-<script>
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
-function cmtBbOpen(comment, id) {
-	if($(comment).hasClass('comment-edit-text-full')) {
-		$(".comment-edit-bb-" + id).show();
-		return true;
-	}
-	return false;
-}
-function cmtBbClose(comment, id) {
-	if($(comment).hasClass('comment-edit-text-empty')) {
-		$(".comment-edit-bb-" + id).hide();
-		return true;
-	}
-	return false;
-}
-
-$(document).ready(function() {
-
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
-
-});
-
-
-</script>
-EOT;
-}

view/theme/decaf-mobile/TODO

@@ -1,31 +0,0 @@
-Photo album display?
-
-- The "lock" icon for private items
-	- change it to black?
-	- when clicked, the popup window displays poorly
-
-- Edit photo page: bottom buttons are off-center in Dolphin Mini
-
-- BB code buttons for status updates
-
-- Get "add contact" back on contacts page
-
-- Allow creating a new private message
-
-- Admin: access to more pages than summary?
-
-- Find a way to show embedded videos at the normal size for tablets that can handle it
-
-- Need to find a way to deal with freakin annoying elements that don't respect screen width limits.
-  Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and
-  making the rest of the body text overflow the item's borders that is screen-width sensitive (it's
-  annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems:
-	- code blocks
-	- blockquote blocks
-	- #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags
-
-- Needs to be faster!
-	- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
-
-
-- Sometimes, when "Permission denied", wrong login page is shown

view/theme/decaf-mobile/images/oxygen/LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.