Merge remote-tracking branch 'refs/remotes/friendica/master'

2017-03-31 19:12:57 -04:00 · 2017-03-31 19:12:57 -04:00 · 092221d471
parent 8ef2b13360 bb04495f5b
commit 092221d471
195 changed files with 11995 additions and 4537 deletions
--- a/.tx/config
+++ b/.tx/config
@ -0,0 +1,392 @@
+[main]
+host = https://www.transifex.com
+
+[friendica.addon_appnet_messagespo]
+file_filter = appnet/lang/<lang>/messages.po
+source_file = appnet/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_blackout_messagespo]
+file_filter = blackout/lang/<lang>/messages.po
+source_file = blackout/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_blockem_messagespo]
+file_filter = blockem/lang/<lang>/messages.po
+source_file = blockem/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_blogger_messagespo]
+file_filter = blogger/lang/<lang>/messages.po
+source_file = blogger/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_buffer_messagespo]
+file_filter = buffer/lang/<lang>/messages.po
+source_file = buffer/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_buglink_messagespo]
+file_filter = buglink/lang/<lang>/messages.po
+source_file = buglink/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_cal_messagespo]
+file_filter = cal/lang/<lang>/messages.po
+source_file = cal/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_communityhome_messagespo]
+file_filter = communityhome/lang/<lang>/messages.po
+source_file = communityhome/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_curweather_messagespo]
+file_filter = curweather/lang/<lang>/messages.po
+source_file = curweather/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_dav_messagespo]
+file_filter = dav/lang/<lang>/messages.po
+source_file = dav/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_diaspora_messagespo]
+file_filter = diaspora/lang/<lang>/messages.po
+source_file = diaspora/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_dwpost_messagespo]
+file_filter = dwpost/lang/<lang>/messages.po
+source_file = dwpost/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_editplain_messagespo]
+file_filter = editplain/lang/<lang>/messages.po
+source_file = editplain/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_forumdirectory_messagespo]
+file_filter = forumdirectory/lang/<lang>/messages.po
+source_file = forumdirectory/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_forumlist_messagespo]
+file_filter = forumlist/lang/<lang>/messages.po
+source_file = forumlist/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_fromapp_messagespo]
+file_filter = fromapp/lang/<lang>/messages.po
+source_file = fromapp/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_fromgplus_messagespo]
+file_filter = fromgplus/lang/<lang>/messages.po
+source_file = fromgplus/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_geonames_messagespo]
+file_filter = geonames/lang/<lang>/messages.po
+source_file = geonames/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_gnot_messagespo]
+file_filter = gnot/lang/<lang>/messages.po
+source_file = gnot/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_gpluspost_messagespo]
+file_filter = gpluspost/lang/<lang>/messages.po
+source_file = gpluspost/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_gravatar_messagespo]
+file_filter = gravatar/lang/<lang>/messages.po
+source_file = gravatar/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_group_text_messagespo]
+file_filter = group_text/lang/<lang>/messages.po
+source_file = group_text/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_ijpost_messagespo]
+file_filter = ijpost/lang/<lang>/messages.po
+source_file = ijpost/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_impressum_messagespo]
+file_filter = impressum/lang/<lang>/messages.po
+source_file = impressum/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_infiniteimprobabilitydrive_messagespo]
+file_filter = infiniteimprobabilitydrive/lang/<lang>/messages.po
+source_file = infiniteimprobabilitydrive/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_irc_messagespo]
+file_filter = irc/lang/<lang>/messages.po
+source_file = irc/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_jappixmini_messagespo]
+file_filter = jappixmini/lang/<lang>/messages.po
+source_file = jappixmini/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_js_upload_messagespo]
+file_filter = js_upload/lang/<lang>/messages.po
+source_file = js_upload/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_krynn_messagespo]
+file_filter = krynn/lang/<lang>/messages.po
+source_file = krynn/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_langfilter_messagespo]
+file_filter = langfilter/lang/<lang>/messages.po
+source_file = langfilter/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_libertree_messagespo]
+file_filter = libertree/lang/<lang>/messages.po
+source_file = libertree/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_libravatar_messagespo]
+file_filter = libravatar/lang/<lang>/messages.po
+source_file = libravatar/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_ljpost_messagespo]
+file_filter = ljpost/lang/<lang>/messages.po
+source_file = ljpost/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_mailstream_messagespo]
+file_filter = mailstream/lang/<lang>/messages.po
+source_file = mailstream/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_morepokes_messagespo]
+file_filter = morepokes/lang/<lang>/messages.po
+source_file = morepokes/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_newmemberwidget_messagespo]
+file_filter = newmemberwidget/lang/<lang>/messages.po
+source_file = newmemberwidget/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_notifyall_messagespo]
+file_filter = notifyall/lang/<lang>/messages.po
+source_file = notifyall/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_notimeline_messagespo]
+file_filter = notimeline/lang/<lang>/messages.po
+source_file = notimeline/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_nsfw_messagespo]
+file_filter = nsfw/lang/<lang>/messages.po
+source_file = nsfw/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_numfriends_messagespo]
+file_filter = numfriends/lang/<lang>/messages.po
+source_file = numfriends/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_openstreetmap_messagespo]
+file_filter = openstreetmap/lang/<lang>/messages.po
+source_file = openstreetmap/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_pageheader_messagespo]
+file_filter = pageheader/lang/<lang>/messages.po
+source_file = pageheader/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_piwik_messagespo]
+file_filter = piwik/lang/<lang>/messages.po
+source_file = piwik/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_planets_messagespo]
+file_filter = planets/lang/<lang>/messages.po
+source_file = planets/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_public_server_messagespo]
+file_filter = public_server/lang/<lang>/messages.po
+source_file = public_server/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_pumpio_messagespo]
+file_filter = pumpio/lang/<lang>/messages.po
+source_file = pumpio/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_qcomment_messagespo]
+file_filter = qcomment/lang/<lang>/messages.po
+source_file = qcomment/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_randplace_messagespo]
+file_filter = randplace/lang/<lang>/messages.po
+source_file = randplace/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_remote_permissions_messagespo]
+file_filter = remote_permissions/lang/<lang>/messages.po
+source_file = remote_permissions/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_rendertime_messagespo]
+file_filter = rendertime/lang/<lang>/messages.po
+source_file = rendertime/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_showmore_messagespo]
+file_filter = showmore/lang/<lang>/messages.po
+source_file = showmore/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_smileybutton_messagespo]
+file_filter = smileybutton/lang/<lang>/messages.po
+source_file = smileybutton/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_snautofollow_messagespo]
+file_filter = snautofollow/lang/<lang>/messages.po
+source_file = snautofollow/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_startpage_messagespo]
+file_filter = startpage/lang/<lang>/messages.po
+source_file = startpage/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_statusnet_messagespo]
+file_filter = statusnet/lang/<lang>/messages.po
+source_file = statusnet/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_superblock_messagespo]
+file_filter = superblock/lang/<lang>/messages.po
+source_file = superblock/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_testdrive_messagespo]
+file_filter = testdrive/lang/<lang>/messages.po
+source_file = testdrive/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_tictac_messagespo]
+file_filter = tictac/lang/<lang>/messages.po
+source_file = tictac/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_tumblr_messagespo]
+file_filter = tumblr/lang/<lang>/messages.po
+source_file = tumblr/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_twitter_messagespo]
+file_filter = twitter/lang/<lang>/messages.po
+source_file = twitter/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_uhremotestorage_messagespo]
+file_filter = uhremotestorage/lang/<lang>/messages.po
+source_file = uhremotestorage/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_webrtc_messagespo]
+file_filter = webrtc/lang/<lang>/messages.po
+source_file = webrtc/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_windowsphonepush_messagespo]
+file_filter = windowsphonepush/lang/<lang>/messages.po
+source_file = windowsphonepush/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_wppost_messagespo]
+file_filter = wppost/lang/<lang>/messages.po
+source_file = wppost/lang/C/messages.po
+source_lang = en
+type = PO
+
+[friendica.addon_yourls_messagespo]
+file_filter = yourls/lang/<lang>/messages.po
+source_file = yourls/lang/C/messages.po
+source_lang = en
+type = PO
--- a/appnet/appnet.php
+++ b/appnet/appnet.php
@ -5,6 +5,7 @@
 * Description: Bidirectional (posting and reading) connector for app.net.
 * Version: 0.2
 * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
 */

 /*
@ -1118,36 +1119,11 @@ function appnet_expand_annotations($a, $annotations) {

 function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {

-	if (function_exists("update_gcontact"))
-		update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2,
-				"network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"],
-				"name" => $contact["name"], "nick" => $contact["username"],
-				"about" => $contact["description"]["text"], "hide" => true,
-				"addr" => $contact["username"]."@app.net"));
-	else {
-		// Old Code
-		$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-				dbesc(normalise_link($contact["canonical_url"])));
-
-		if (count($r) == 0)
-			q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-				dbesc(normalise_link($contact["canonical_url"])),
-				dbesc($contact["name"]),
-				dbesc($contact["username"]),
-				dbesc($contact["avatar_image"]["url"]));
-		else
-			q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-				dbesc($contact["name"]),
-				dbesc($contact["username"]),
-				dbesc($contact["avatar_image"]["url"]),
-				dbesc(normalise_link($contact["canonical_url"])));
-
-		if (DB_UPDATE_VERSION >= "1177")
-			q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
-				dbesc(""),
-				dbesc($contact["description"]["text"]),
-				dbesc(normalise_link($contact["canonical_url"])));
-	}
+	update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2,
+			"network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"],
+			"name" => $contact["name"], "nick" => $contact["username"],
+			"about" => $contact["description"]["text"], "hide" => true,
+			"addr" => $contact["username"]."@app.net"));

 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 		intval($uid), dbesc("adn::".$contact["id"]));
@ -1174,8 +1150,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 		// create contact record
 		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
-					`writable`, `blocked`, `readonly`, `pending` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+					`about`, `writable`, `blocked`, `readonly`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, 0, 0, 0 ) ",
 			intval($uid),
 			dbesc(datetime_convert()),
 			dbesc($contact["canonical_url"]),
@ -1190,6 +1166,7 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 			dbesc(NETWORK_APPNET),
 			intval(CONTACT_IS_FRIEND),
 			intval(1),
+			dbesc($contact["description"]["text"]),
 			intval(1)
 		);

@ -1231,15 +1208,6 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 			dbesc(datetime_convert()),
 			intval($contact_id)
 		);
-
-		if (DB_UPDATE_VERSION >= "1177")
-			q("UPDATE `contact` SET `location` = '%s',
-						`about` = '%s'
-					WHERE `id` = %d",
-				dbesc(""),
-				dbesc($contact["description"]["text"]),
-				intval($contact_id)
-			);
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.

@ -1266,7 +1234,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 						`nurl` = '%s',
 						`addr` = '%s',
 						`name` = '%s',
-						`nick` = '%s'
+						`nick` = '%s',
+						`about` = '%s'
 					WHERE `id` = %d",
 				dbesc($photos[0]),
 				dbesc($photos[1]),
@ -1279,16 +1248,9 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 				dbesc($contact["username"]."@app.net"),
 				dbesc($contact["name"]),
 				dbesc($contact["username"]),
+				dbesc($contact["description"]["text"]),
 				intval($r[0]['id'])
 			);
-			if (DB_UPDATE_VERSION >= "1177")
-				q("UPDATE `contact` SET `location` = '%s',
-							`about` = '%s'
-						WHERE `id` = %d",
-					dbesc(""),
-					dbesc($contact["description"]["text"]),
-					intval($r[0]['id'])
-				);
 		}
 	}

--- a/appnet/lang/es/messages.po
+++ b/appnet/lang/es/messages.po
@ -0,0 +1,118 @@
+# ADDON appnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnet addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2016-10-13 21:25+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appnet.php:39
+msgid "Permission denied."
+msgstr "Permiso denegado"
+
+#: appnet.php:73
+msgid "You are now authenticated to app.net. "
+msgstr "Ahora está autenticado en app.net."
+
+#: appnet.php:77
+msgid "<p>Error fetching token. Please try again.</p>"
+msgstr "<p>Advertencia de error. Por favor inténtelo de nuevo.</p>"
+
+#: appnet.php:80
+msgid "return to the connector page"
+msgstr "vuelva a pa página de conexón"
+
+#: appnet.php:94
+msgid "Post to app.net"
+msgstr "Publique en app.net"
+
+#: appnet.php:125 appnet.php:129
+msgid "App.net Export"
+msgstr "Exportar a app.net"
+
+#: appnet.php:142
+msgid "Currently connected to: "
+msgstr "Actualmente conectado a:"
+
+#: appnet.php:144
+msgid "Enable App.net Post Plugin"
+msgstr "Habilitar el plugin de publicación de App.net"
+
+#: appnet.php:149
+msgid "Post to App.net by default"
+msgstr "Publicar en App.net por defecto"
+
+#: appnet.php:153
+msgid "Import the remote timeline"
+msgstr "Importar la línea de tiempo remota"
+
+#: appnet.php:159
+msgid ""
+"<p>Error fetching user profile. Please clear the configuration and try "
+"again.</p>"
+msgstr "<p>Advertencia de error de perfil. Por favor borre la configuración e inténtelo de nuevo.</p>"
+
+#: appnet.php:164
+msgid "<p>You have two ways to connect to App.net.</p>"
+msgstr "<p>Tiene dos formas de conectar a App.net.</p>"
+
+#: appnet.php:166
+msgid ""
+"<p>First way: Register an application at <a "
+"href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a>"
+" and enter Client ID and Client Secret. "
+msgstr "<p>Primera forma: Registrar una aplicación en <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> y seleccionar Client ID y Client Secret. "
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI<p>"
+msgstr "Use '%s' como Redirigir URI"
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr "ID de cliente"
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr "Secreto de cliente"
+
+#: appnet.php:177
+msgid ""
+"<p>Second way: fetch a token at <a href=\"http://dev-"
+"lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+msgstr "<p>Segunda manera: traiga un símbolo a <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>"
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'.</p>"
+msgstr "Seleccione estas posibilidades: 'Básico', 'Continuo', 'Escribir entrada', 'Mensajes públicos', 'Mensajes'.</p>"
+
+#: appnet.php:180
+msgid "Token"
+msgstr "Símbolo"
+
+#: appnet.php:192
+msgid "Sign in using App.net"
+msgstr "Regístrese usando App.net"
+
+#: appnet.php:197
+msgid "Clear OAuth configuration"
+msgstr "Borre la configuración OAuth"
+
+#: appnet.php:204
+msgid "Save Settings"
+msgstr "Guardar los ajustes"
--- a/appnet/lang/es/strings.php
+++ b/appnet/lang/es/strings.php
@ -0,0 +1,29 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permiso denegado";
+$a->strings["You are now authenticated to app.net. "] = "Ahora está autenticado en app.net.";
+$a->strings["<p>Error fetching token. Please try again.</p>"] = "<p>Advertencia de error. Por favor inténtelo de nuevo.</p>";
+$a->strings["return to the connector page"] = "vuelva a pa página de conexón";
+$a->strings["Post to app.net"] = "Publique en app.net";
+$a->strings["App.net Export"] = "Exportar a app.net";
+$a->strings["Currently connected to: "] = "Actualmente conectado a:";
+$a->strings["Enable App.net Post Plugin"] = "Habilitar el plugin de publicación de App.net";
+$a->strings["Post to App.net by default"] = "Publicar en App.net por defecto";
+$a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota";
+$a->strings["<p>Error fetching user profile. Please clear the configuration and try again.</p>"] = "<p>Advertencia de error de perfil. Por favor borre la configuración e inténtelo de nuevo.</p>";
+$a->strings["<p>You have two ways to connect to App.net.</p>"] = "<p>Tiene dos formas de conectar a App.net.</p>";
+$a->strings["<p>First way: Register an application at <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> and enter Client ID and Client Secret. "] = "<p>Primera forma: Registrar una aplicación en <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> y seleccionar Client ID y Client Secret. ";
+$a->strings["Use '%s' as Redirect URI<p>"] = "Use '%s' como Redirigir URI";
+$a->strings["Client ID"] = "ID de cliente";
+$a->strings["Client Secret"] = "Secreto de cliente";
+$a->strings["<p>Second way: fetch a token at <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "] = "<p>Segunda manera: traiga un símbolo a <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>";
+$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>"] = "Seleccione estas posibilidades: 'Básico', 'Continuo', 'Escribir entrada', 'Mensajes públicos', 'Mensajes'.</p>";
+$a->strings["Token"] = "Símbolo";
+$a->strings["Sign in using App.net"] = "Regístrese usando App.net";
+$a->strings["Clear OAuth configuration"] = "Borre la configuración OAuth";
+$a->strings["Save Settings"] = "Guardar los ajustes";
--- a/appnet/lang/it/messages.po
+++ b/appnet/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 11:47+0200\n"
 "PO-Revision-Date: 2014-09-10 10:18+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/blackout/lang/it/messages.po
+++ b/blackout/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 10:22+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/blackout/lang/sv/messages.po
+++ b/blackout/lang/sv/messages.po
@ -0,0 +1,52 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2017-02-13 20:15+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:99
+msgid "Save Settings"
+msgstr "Spara inställningar"
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr ""
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr ""
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr ""
--- a/blackout/lang/sv/strings.php
+++ b/blackout/lang/sv/strings.php
@ -1,3 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Spara";
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["Redirect URL"] = "";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "";
+$a->strings["Begin of the Blackout"] = "";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "";
+$a->strings["End of the Blackout"] = "";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "";
--- a/blockem/lang/it/messages.po
+++ b/blockem/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 10:23+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/blogger/lang/es/messages.po
+++ b/blogger/lang/es/messages.po
@ -0,0 +1,55 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-10-10 20:33+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Entrada para blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Esportar Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Plugin"
+msgstr "Activar plugin de entrada de Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nombre de usuario de Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Contraseña de Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL API de Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Entrada a Blogger por defecto"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Entrada desde Friendica"
--- a/blogger/lang/es/strings.php
+++ b/blogger/lang/es/strings.php
@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Post to blogger"] = "Publícar en Blogger";
-$a->strings["Blogger Post Settings"] = "Configuración de las publicaciones en Blogger";
-$a->strings["Enable Blogger Post Plugin"] = "Activar el módulo de publicación en Blogger";
-$a->strings["Blogger username"] = "Nombre de usuario de Blogger";
-$a->strings["Blogger password"] = "Contraseña de Blogger";
-$a->strings["Blogger API URL"] = "Dirección de la API de Blogger";
-$a->strings["Post to Blogger by default"] = "Publicar en Blogger por defecto";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Post from Friendica"] = "Publicado desde Friendica";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Entrada para blogger";
+$a->strings["Blogger Export"] = "Esportar Blogger";
+$a->strings["Enable Blogger Post Plugin"] = "Activar plugin de entrada de Blogger";
+$a->strings["Blogger username"] = "Nombre de usuario de Blogger";
+$a->strings["Blogger password"] = "Contraseña de Blogger";
+$a->strings["Blogger API URL"] = "URL API de Blogger";
+$a->strings["Post to Blogger by default"] = "Entrada a Blogger por defecto";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Post from Friendica"] = "Entrada desde Friendica";
--- a/blogger/lang/it/messages.po
+++ b/blogger/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 10:24+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Name: Buffer Post Connector
- * Description: Post to Buffer (Linkedin, App.net, Google+, Facebook, Twitter)
+ * Description: Post to Buffer (Facebook, Google+, LinkedIn, Twitter)
 * Version: 0.2
 * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
 */
@ -328,15 +328,14 @@ function buffer_send(&$a,&$b) {
 				if (isset($post["preview"]))
 					$post["preview"] = proxy_url($post["preview"]);

-				//if ($profile->service == "twitter") {
-				if ($includedlinks) {
-					if (isset($post["url"]))
-						$post["url"] = short_link($post["url"]);
-					if (isset($post["image"]))
-						$post["image"] = short_link($post["image"]);
-					if (isset($post["preview"]))
-						$post["preview"] = short_link($post["preview"]);
-				}
+				//if ($includedlinks) {
+				//	if (isset($post["url"]))
+				//		$post["url"] = short_link($post["url"]);
+				//	if (isset($post["image"]))
+				//		$post["image"] = short_link($post["image"]);
+				//	if (isset($post["preview"]))
+				//		$post["preview"] = short_link($post["preview"]);
+				//}

 				// Seems like a bug to me
 				// Buffer doesn't add links to Twitter and App.net (but pictures)
--- a/buffer/lang/es/messages.po
+++ b/buffer/lang/es/messages.po
@ -0,0 +1,75 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-10-10 20:39+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permiso denegado"
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "ID de cliente"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Secreto de cliente"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Error al registrar cunexión de buffer"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Ahora está autenticado al fufer"
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "Vuelva a la página de conexión"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Publique en Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Exportar Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autenticar su conexión de Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Plugin"
+msgstr "Active el plugin de publicación de Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Publicar en Buffer por defecto"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Verificar para eliminar este preajuste"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Las publicaciones van a todas las cuentas que estén habilitadas por defecto"
--- a/buffer/lang/es/strings.php
+++ b/buffer/lang/es/strings.php
@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permiso denegado";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Client ID"] = "ID de cliente";
+$a->strings["Client Secret"] = "Secreto de cliente";
+$a->strings["Error when registering buffer connection:"] = "Error al registrar cunexión de buffer";
+$a->strings["You are now authenticated to buffer. "] = "Ahora está autenticado al fufer";
+$a->strings["return to the connector page"] = "Vuelva a la página de conexión";
+$a->strings["Post to Buffer"] = "Publique en Buffer";
+$a->strings["Buffer Export"] = "Exportar Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Autenticar su conexión de Buffer";
+$a->strings["Enable Buffer Post Plugin"] = "Active el plugin de publicación de Buffer";
+$a->strings["Post to Buffer by default"] = "Publicar en Buffer por defecto";
+$a->strings["Check to delete this preset"] = "Verificar para eliminar este preajuste";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Las publicaciones van a todas las cuentas que estén habilitadas por defecto";
--- a/buffer/lang/it/messages.po
+++ b/buffer/lang/it/messages.po
@ -5,14 +5,14 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sandro Santilli <strk@keybit.net>, 2015
+# Sandro Santilli <strk@kbt.io>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2015-11-01 11:05+0000\n"
-"Last-Translator: Sandro Santilli <strk@keybit.net>\n"
+"Last-Translator: Sandro Santilli <strk@kbt.io>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/buglink/lang/es/messages.po
+++ b/buglink/lang/es/messages.po
@ -0,0 +1,23 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-10-10 20:42+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Reportar error"
--- a/buglink/lang/es/strings.php
+++ b/buglink/lang/es/strings.php
@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Report Bug"] = "Informe de errores";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Report Bug"] = "Reportar error";
--- a/buglink/lang/it/messages.po
+++ b/buglink/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 10:27+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/buglink/lang/sv/messages.po
+++ b/buglink/lang/sv/messages.po
@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2017-02-13 20:15+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Rapportera bugg"
--- a/buglink/lang/sv/strings.php
+++ b/buglink/lang/sv/strings.php
@ -1,2 +1,8 @@
-<?php
-
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Report Bug"] = "Rapportera bugg";
--- a/cal/lang/es/messages.po
+++ b/cal/lang/es/messages.po
@ -0,0 +1,55 @@
+# ADDON cal
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cal addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-10-10 20:48+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: cal.php:33
+msgid "Event Export"
+msgstr "Exportación de evento"
+
+#: cal.php:33
+msgid "You can download public events from: "
+msgstr "Puede descargar eventos públicos desde:"
+
+#: cal.php:53
+msgid "The user does not export the calendar."
+msgstr "El usuario no exporta el calendario."
+
+#: cal.php:83
+msgid "This calendar format is not supported"
+msgstr "No se soporta este formato de calendario"
+
+#: cal.php:181 cal.php:185
+msgid "Export Events"
+msgstr "Exportar Eventos"
+
+#: cal.php:189
+msgid "If this is enabled, your public events will be available at"
+msgstr "Si esto está habilitado, sus eventos públicos estarán permitidos en"
+
+#: cal.php:190
+msgid "Currently supported formats are ical and csv."
+msgstr "Los formatos soportados actualmente son ical y csv."
+
+#: cal.php:191
+msgid "Enable calendar export"
+msgstr "Habilitar exportar calendario"
+
+#: cal.php:193
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
--- a/cal/lang/es/strings.php
+++ b/cal/lang/es/strings.php
@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Event Export"] = "Exportación de evento";
+$a->strings["You can download public events from: "] = "Puede descargar eventos públicos desde:";
+$a->strings["The user does not export the calendar."] = "El usuario no exporta el calendario.";
+$a->strings["This calendar format is not supported"] = "No se soporta este formato de calendario";
+$a->strings["Export Events"] = "Exportar Eventos";
+$a->strings["If this is enabled, your public events will be available at"] = "Si esto está habilitado, sus eventos públicos estarán permitidos en";
+$a->strings["Currently supported formats are ical and csv."] = "Los formatos soportados actualmente son ical y csv.";
+$a->strings["Enable calendar export"] = "Habilitar exportar calendario";
+$a->strings["Save Settings"] = "Guardar Ajustes";
--- a/cal/lang/it/messages.po
+++ b/cal/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 10:30+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/communityhome/lang/es/messages.po
+++ b/communityhome/lang/es/messages.po
@ -0,0 +1,73 @@
+# ADDON communityhome
+# Copyright (C)
+# This file is distributed under the same license as the Friendica communityhome addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-10 20:53+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: communityhome.php:28 communityhome.php:34
+msgid "Login"
+msgstr "Acceder"
+
+#: communityhome.php:29
+msgid "OpenID"
+msgstr "ID Abierta"
+
+#: communityhome.php:39
+msgid "Latest users"
+msgstr "Usuarios recientes"
+
+#: communityhome.php:84
+msgid "Most active users"
+msgstr "Usuarios más activos"
+
+#: communityhome.php:102
+msgid "Latest photos"
+msgstr "Fotos recientes"
+
+#: communityhome.php:115
+msgid "Contact Photos"
+msgstr "Fotos de contacto"
+
+#: communityhome.php:116
+msgid "Profile Photos"
+msgstr "Fotos de perfil"
+
+#: communityhome.php:141
+msgid "Latest likes"
+msgstr "Últomos Me gusta"
+
+#: communityhome.php:163
+msgid "event"
+msgstr "evento"
+
+#: communityhome.php:166 communityhome.php:175
+msgid "status"
+msgstr "estatus social"
+
+#: communityhome.php:171
+msgid "photo"
+msgstr "foto"
+
+#: communityhome.php:180
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s le gusta %2$s's %3$s"
+
+#: communityhome.php:189
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
--- a/communityhome/lang/es/strings.php
+++ b/communityhome/lang/es/strings.php
@ -1,14 +1,20 @@
-<?php
-
-$a->strings["Login"] = "Acceder";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Latest users"] = "Últimos usuarios";
-$a->strings["Most active users"] = "Usuarios más activos";
-$a->strings["Latest photos"] = "Últimas fotos";
-$a->strings["Contact Photos"] = "Foto del contacto";
-$a->strings["Profile Photos"] = "Foto del perfil";
-$a->strings["Latest likes"] = "Últimos me gusta";
-$a->strings["event"] = "evento";
-$a->strings["status"] = "estado";
-$a->strings["photo"] = "foto";
-$a->strings["Welcome to %s"] = "Bienvenido a %s";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Login"] = "Acceder";
+$a->strings["OpenID"] = "ID Abierta";
+$a->strings["Latest users"] = "Usuarios recientes";
+$a->strings["Most active users"] = "Usuarios más activos";
+$a->strings["Latest photos"] = "Fotos recientes";
+$a->strings["Contact Photos"] = "Fotos de contacto";
+$a->strings["Profile Photos"] = "Fotos de perfil";
+$a->strings["Latest likes"] = "Últomos Me gusta";
+$a->strings["event"] = "evento";
+$a->strings["status"] = "estatus social";
+$a->strings["photo"] = "foto";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %2\$s's %3\$s";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
--- a/communityhome/lang/it/messages.po
+++ b/communityhome/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2014-09-10 10:30+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/curweather/lang/es/messages.po
+++ b/curweather/lang/es/messages.po
@ -0,0 +1,132 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2016-10-23 11:30+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Error al traer información del clima.\\nError era: "
+
+#: curweather.php:111 curweather.php:172
+msgid "Current Weather"
+msgstr "Clima actual"
+
+#: curweather.php:118
+msgid "Relative Humidity"
+msgstr "Humedad relativa"
+
+#: curweather.php:119
+msgid "Pressure"
+msgstr "Presión"
+
+#: curweather.php:120
+msgid "Wind"
+msgstr "Viento"
+
+#: curweather.php:121
+msgid "Last Updated"
+msgstr "Última actualización"
+
+#: curweather.php:122
+msgid "Data by"
+msgstr "Información por"
+
+#: curweather.php:123
+msgid "Show on map"
+msgstr "Mostrar en mapa"
+
+#: curweather.php:128
+msgid "There was a problem accessing the weather data. But have a look"
+msgstr "Hubo un problema al acceder a la información del clima. Pero eche un vistazo"
+
+#: curweather.php:130
+msgid "at OpenWeatherMap"
+msgstr "en OpenWeatherMap"
+
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Ajustes de clima actual actualizados"
+
+#: curweather.php:161
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr "No se encontró APPID, por favor contacte con su administrador para obtener una."
+
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Ajustes"
+
+#: curweather.php:174
+msgid "Enter either the name of your location or the zip code."
+msgstr "Introduzca el nombre de su ubicación o el código postal."
+
+#: curweather.php:175
+msgid "Your Location"
+msgstr "Su ubicación"
+
+#: curweather.php:175
+msgid ""
+"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
+"<em>14476,DE</em>."
+msgstr "Identificador de su ubicación (nombre o código postal), ej. <em>Berlin,DE</em> o <em>14476,DE</em>."
+
+#: curweather.php:176
+msgid "Units"
+msgstr "Unidades"
+
+#: curweather.php:176
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
+msgstr "seleccionar si la temperatura debería ser mostrada en &deg;C o &deg;F"
+
+#: curweather.php:177
+msgid "Show weather data"
+msgstr "Mostrar información de clima"
+
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Ajustes de clima guardados."
+
+#: curweather.php:201
+msgid "Caching Interval"
+msgstr "Obteniendo intervalo"
+
+#: curweather.php:201
+msgid ""
+"For how long should the weather data be cached? Choose according your "
+"OpenWeatherMap account type."
+msgstr "¿Durante cuánto tiempo debería ser obtenida la información de clima? Eliga de acuerdo a su tipo de cuenta de OpenWeatherMap."
+
+#: curweather.php:201
+msgid "no cache"
+msgstr "sin almacenamiento"
+
+#: curweather.php:201
+msgid "minutes"
+msgstr "minutos"
+
+#: curweather.php:202
+msgid "Your APPID"
+msgstr "Su APPID"
+
+#: curweather.php:202
+msgid "Your API key provided by OpenWeatherMap"
+msgstr "Su clave API provista por OpenWeatherMap"
--- a/curweather/lang/es/strings.php
+++ b/curweather/lang/es/strings.php
@ -1,3 +1,34 @@
-<?php
-
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Error al traer información del clima.\\nError era: ";
+$a->strings["Current Weather"] = "Clima actual";
+$a->strings["Relative Humidity"] = "Humedad relativa";
+$a->strings["Pressure"] = "Presión";
+$a->strings["Wind"] = "Viento";
+$a->strings["Last Updated"] = "Última actualización";
+$a->strings["Data by"] = "Información por";
+$a->strings["Show on map"] = "Mostrar en mapa";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Hubo un problema al acceder a la información del clima. Pero eche un vistazo";
+$a->strings["at OpenWeatherMap"] = "en OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Ajustes de clima actual actualizados";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "No se encontró APPID, por favor contacte con su administrador para obtener una.";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Settings"] = "Ajustes";
+$a->strings["Enter either the name of your location or the zip code."] = "Introduzca el nombre de su ubicación o el código postal.";
+$a->strings["Your Location"] = "Su ubicación";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificador de su ubicación (nombre o código postal), ej. <em>Berlin,DE</em> o <em>14476,DE</em>.";
+$a->strings["Units"] = "Unidades";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "seleccionar si la temperatura debería ser mostrada en &deg;C o &deg;F";
+$a->strings["Show weather data"] = "Mostrar información de clima";
+$a->strings["Curweather settings saved."] = "Ajustes de clima guardados.";
+$a->strings["Caching Interval"] = "Obteniendo intervalo";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "¿Durante cuánto tiempo debería ser obtenida la información de clima? Eliga de acuerdo a su tipo de cuenta de OpenWeatherMap.";
+$a->strings["no cache"] = "sin almacenamiento";
+$a->strings["minutes"] = "minutos";
+$a->strings["Your APPID"] = "Su APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Su clave API provista por OpenWeatherMap";
--- a/curweather/lang/it/messages.po
+++ b/curweather/lang/it/messages.po
@ -5,13 +5,14 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-13 18:46+0200\n"
-"PO-Revision-Date: 2015-08-31 10:11+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2016-11-22 06:43+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -19,114 +20,114 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: curweather.php:30
+#: curweather.php:31
 msgid "Error fetching weather data.\\nError was: "
 msgstr "Errore recuperando i dati meteo: "

-#: curweather.php:103 curweather.php:163
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Meteo"

-#: curweather.php:109
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Umidità Relativa"

-#: curweather.php:110
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Pressione"

-#: curweather.php:111
+#: curweather.php:120
 msgid "Wind"
 msgstr "Vento"

-#: curweather.php:112
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Ultimo Aggiornamento: "

-#: curweather.php:113
+#: curweather.php:122
 msgid "Data by"
 msgstr "Data da"

-#: curweather.php:114
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Mostra sulla mappa"

-#: curweather.php:119
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"

-#: curweather.php:121
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "a OpenWeatherMap"

-#: curweather.php:137
+#: curweather.php:146
 msgid "Current Weather settings updated."
 msgstr "Impostazioni Meteo aggiornate."

-#: curweather.php:152
-msgid "No APPID found, please contact your admin to optain one."
+#: curweather.php:161
+msgid "No APPID found, please contact your admin to obtain one."
 msgstr "APPID non trovata, contatta il tuo amministratore per averne una."

-#: curweather.php:162 curweather.php:191
+#: curweather.php:171 curweather.php:200
 msgid "Save Settings"
 msgstr "Salva Impostazioni"

-#: curweather.php:163
+#: curweather.php:172
 msgid "Settings"
 msgstr "Impostazioni"

-#: curweather.php:165
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Inserisci il nome della tua posizione o il CAP"

-#: curweather.php:166
+#: curweather.php:175
 msgid "Your Location"
 msgstr "La tua Posizione"

-#: curweather.php:166
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>."

-#: curweather.php:167
+#: curweather.php:176
 msgid "Units"
 msgstr "Unità"

-#: curweather.php:167
-msgid "select if the temperatur should be displayed in °C or °F"
+#: curweather.php:176
+msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "scegli se la temperatura deve essere mostrata in °C o in °F"

-#: curweather.php:168
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Mostra dati meteo"

-#: curweather.php:181
+#: curweather.php:190
 msgid "Curweather settings saved."
 msgstr "Impostazioni Curweather salvati."

-#: curweather.php:192
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Intervallo di cache"

-#: curweather.php:192
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap."

-#: curweather.php:192
+#: curweather.php:201
 msgid "no cache"
 msgstr "nessuna cache"

-#: curweather.php:192
+#: curweather.php:201
 msgid "minutes"
 msgstr "minuti"

-#: curweather.php:193
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Il tuo APPID"

-#: curweather.php:193
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "La tua chiave API da OpenWeatherMap"
--- a/curweather/lang/it/strings.php
+++ b/curweather/lang/it/strings.php
@ -16,14 +16,14 @@ $a->strings["Show on map"] = "Mostra sulla mappa";
 $a->strings["There was a problem accessing the weather data. But have a look"] = "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata";
 $a->strings["at OpenWeatherMap"] = "a OpenWeatherMap";
 $a->strings["Current Weather settings updated."] = "Impostazioni Meteo aggiornate.";
-$a->strings["No APPID found, please contact your admin to optain one."] = "APPID non trovata, contatta il tuo amministratore per averne una.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "APPID non trovata, contatta il tuo amministratore per averne una.";
 $a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["Settings"] = "Impostazioni";
 $a->strings["Enter either the name of your location or the zip code."] = "Inserisci il nome della tua posizione o il CAP";
 $a->strings["Your Location"] = "La tua Posizione";
 $a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.";
 $a->strings["Units"] = "Unità";
-$a->strings["select if the temperatur should be displayed in °C or °F"] = "scegli se la temperatura deve essere mostrata in °C o in °F";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "scegli se la temperatura deve essere mostrata in °C o in °F";
 $a->strings["Show weather data"] = "Mostra dati meteo";
 $a->strings["Curweather settings saved."] = "Impostazioni Curweather salvati.";
 $a->strings["Caching Interval"] = "Intervallo di cache";
--- a/dav/lang/es/messages.po
+++ b/dav/lang/es/messages.po
@ -0,0 +1,579 @@
+# ADDON dav
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dav addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 20:48+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Eventos Nativos de Friendica"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:59
+msgid "Friendica-Contacts"
+msgstr "Contactos de Friendica"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+msgid "Your Friendica-Contacts"
+msgstr "Sus contactos de Friendica"
+
+#: friendica/layout.fnk.php:99 friendica/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr "Algo fue mal al intentar importar el archivo. Perdón. Quizá algunos eventos fueron importados de todas formas."
+
+#: friendica/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr "Algo fue mal al intentar importar el archivio. Perdón."
+
+#: friendica/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr "El archivo ICS ha sido importado."
+
+#: friendica/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr "No se ha cargado en ningún archivo."
+
+#: friendica/layout.fnk.php:143 friendica/layout.fnk.php:422
+#: common/wdcal_edit.inc.php:140
+msgid "Go back to the calendar"
+msgstr "Volver al calendario"
+
+#: friendica/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr "Importar un archivo ICS"
+
+#: friendica/layout.fnk.php:150
+msgid "ICS-File"
+msgstr "Archivo ICS"
+
+#: friendica/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr "Sobreescribir todos los eventos #num# existentes"
+
+#: friendica/layout.fnk.php:152
+msgid "Upload"
+msgstr "Cargar"
+
+#: friendica/layout.fnk.php:225
+msgid "Settings"
+msgstr "Ajustes"
+
+#: friendica/layout.fnk.php:225
+msgid "Help"
+msgstr "Ayuda"
+
+#: friendica/layout.fnk.php:228
+msgid "New event"
+msgstr "Nuevo evento"
+
+#: friendica/layout.fnk.php:232
+msgid "Today"
+msgstr "Hoy"
+
+#: friendica/layout.fnk.php:241
+msgid "Day"
+msgstr "Día"
+
+#: friendica/layout.fnk.php:248
+msgid "Week"
+msgstr "Semana"
+
+#: friendica/layout.fnk.php:255 common/wdcal_edit.inc.php:372
+msgid "Month"
+msgstr "Mes"
+
+#: friendica/layout.fnk.php:260
+msgid "Reload"
+msgstr "Recargar"
+
+#: friendica/layout.fnk.php:263
+msgid "Previous"
+msgstr "Anterior"
+
+#: friendica/layout.fnk.php:266
+msgid "Next"
+msgstr "Siguiente"
+
+#: friendica/layout.fnk.php:271
+msgid "Date"
+msgstr "Fecha"
+
+#: friendica/layout.fnk.php:313
+msgid "Error"
+msgstr "Error"
+
+#: friendica/layout.fnk.php:354
+msgid "Permission denied."
+msgstr "Permiso denegado."
+
+#: friendica/layout.fnk.php:361
+msgid "The new values have been saved."
+msgstr "Los nuevos valores se han guardado."
+
+#: friendica/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr "El calendario se ha actualizado."
+
+#: friendica/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr "El nuevo calendario se ha creado."
+
+#: friendica/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr "El calendario ha sido eliminado."
+
+#: friendica/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr "Ajustes de calendario"
+
+#: friendica/layout.fnk.php:430
+msgid "Date format"
+msgstr "Formato de fecha"
+
+#: friendica/layout.fnk.php:439
+msgid "Time zone"
+msgstr "Zona horaria"
+
+#: friendica/layout.fnk.php:441 friendica/layout.fnk.php:488
+msgid "Save"
+msgstr "Guardar"
+
+#: friendica/layout.fnk.php:445
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: friendica/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr "Crear un nuevo calendario"
+
+#: friendica/layout.fnk.php:496
+msgid "Limitations"
+msgstr "Límites"
+
+#: friendica/layout.fnk.php:500
+msgid "Warning"
+msgstr "Advertencia"
+
+#: friendica/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Sincronización (iPhone, Thunderbird Lightning, Android, ...)"
+
+#: friendica/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Sincronizar este calendario con el iPhone"
+
+#: friendica/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Sincronizar sus contactos de Friendica con el iPhone"
+
+#: friendica/main.php:202
+msgid ""
+"The current version of this plugin has not been set up correctly. Please "
+"contact the system administrator of your installation of friendica to fix "
+"this."
+msgstr "La versión actual de este plugin no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto."
+
+#: friendica/main.php:239 common/wdcal_edit.inc.php:146
+msgid "Calendar"
+msgstr "Calendario"
+
+#: friendica/main.php:242
+msgid "Extended calendar with CalDAV-support"
+msgstr "Estendido el calendario con soporte CalDAV"
+
+#: friendica/main.php:279 friendica/main.php:280
+msgid "noreply"
+msgstr "no responder"
+
+#: friendica/main.php:282
+msgid "Notification: "
+msgstr "Notificación: "
+
+#: friendica/main.php:309
+msgid "The database tables have been installed."
+msgstr "Las tablas de bases de datos se han instalado."
+
+#: friendica/main.php:310
+msgid "An error occurred during the installation."
+msgstr "Hubo un error durante la instalación."
+
+#: friendica/main.php:316
+msgid "The database tables have been updated."
+msgstr "Las tablas de bases de datos se han actualizado."
+
+#: friendica/main.php:317
+msgid "An error occurred during the update."
+msgstr "Hubo un error durante la actualización."
+
+#: friendica/main.php:333
+msgid "No system-wide settings yet."
+msgstr "Aún no hay ajustes para todo el sistema."
+
+#: friendica/main.php:336
+msgid "Database status"
+msgstr "Estado de base de datos"
+
+#: friendica/main.php:339
+msgid "Installed"
+msgstr "Instalado"
+
+#: friendica/main.php:343
+msgid "Upgrade needed"
+msgstr "Actualización requerida"
+
+#: friendica/main.php:343
+msgid ""
+"Please back up all calendar data (the tables beginning with dav_*) before "
+"proceeding. While all calendar events <i>should</i> be converted to the new "
+"database structure, it's always safe to have a backup. Below, you can have a"
+" look at the database-queries that will be made when pressing the "
+"'update'-button."
+msgstr "Por favor haga una copia de seguridad de toda la información de calendario (las tablas que empiezan por dav_*) antes de proceder. Mientras todos los eventos de calendario <i>deberían</i> de ser convertidos a la nueva estructura de base de datos, siempre es seguro tener copia de seguridad. Debajo, puede echar un vistazo a las colsultas de base de datos que se crearán al presionar el botón 'actualizar'."
+
+#: friendica/main.php:343
+msgid "Upgrade"
+msgstr "Actualizar"
+
+#: friendica/main.php:346
+msgid "Not installed"
+msgstr "No instalado"
+
+#: friendica/main.php:346
+msgid "Install"
+msgstr "Instalar"
+
+#: friendica/main.php:350
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: friendica/main.php:350
+msgid ""
+"Something really went wrong. I cannot recover from this state automatically,"
+" sorry. Please go to the database backend, back up the data, and delete all "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine"
+" should be able to reinitialize the tables automatically."
+msgstr "Algo fue realmente mal. No puedo recuperarme de este estado automáticamente, lo siento. Por favor vaya a la parte trasera de la base de datos, haga una copia de seguridad de la información, y elimine todas las tablas que empiecen por 'dav_' manualmente. Después de eso, esta rutina de instalación debería ser capaz de reiniciar las tablas automáticamente."
+
+#: friendica/main.php:355
+msgid "Troubleshooting"
+msgstr "Resolución de problemas"
+
+#: friendica/main.php:356
+msgid "Manual creation of the database tables:"
+msgstr "Creación manual de las tablas de base de datos:"
+
+#: friendica/main.php:357
+msgid "Show SQL-statements"
+msgstr "Mostrar declaraciones SQL"
+
+#: friendica/calendar.friendica.fnk.php:206
+msgid "Private Calendar"
+msgstr "Calendario Privado"
+
+#: friendica/calendar.friendica.fnk.php:207
+msgid "Friendica Events: Mine"
+msgstr "Eventos de Friendica: Mío"
+
+#: friendica/calendar.friendica.fnk.php:208
+msgid "Friendica Events: Contacts"
+msgstr "Efentos de Friendica: Contactos"
+
+#: friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Direcciones Privadas"
+
+#: friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Contactos de Friendica"
+
+#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
+msgstr "Podría no abrir el componente para editar"
+
+#: common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr "Información de evento"
+
+#: common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr "Color especial"
+
+#: common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr "Tema"
+
+#: common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr "Empieza"
+
+#: common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr "Termina"
+
+#: common/wdcal_edit.inc.php:183
+msgid "Location"
+msgstr "Ubicación"
+
+#: common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr "Descripción"
+
+#: common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr "Repetición"
+
+#: common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: common/wdcal_edit.inc.php:191
+msgid "None"
+msgstr "Ninguno"
+
+#: common/wdcal_edit.inc.php:194
+msgid "Daily"
+msgstr "Diariamente"
+
+#: common/wdcal_edit.inc.php:197
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: common/wdcal_edit.inc.php:200
+msgid "Monthly"
+msgstr "Mensual"
+
+#: common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr "Anualmente"
+
+#: common/wdcal_edit.inc.php:214
+msgid "days"
+msgstr "días"
+
+#: common/wdcal_edit.inc.php:215
+msgid "weeks"
+msgstr "semanas"
+
+#: common/wdcal_edit.inc.php:216
+msgid "months"
+msgstr "meses"
+
+#: common/wdcal_edit.inc.php:217
+msgid "years"
+msgstr "años"
+
+#: common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr "intervalo"
+
+#: common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr "Todo el %select% %time%"
+
+#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260
+#: common/wdcal_edit.inc.php:481
+msgid "Days"
+msgstr "Días"
+
+#: common/wdcal_edit.inc.php:231 common/wdcal_edit.inc.php:254
+#: common/wdcal_edit.inc.php:270 common/wdcal_edit.inc.php:293
+#: common/wdcal_edit.inc.php:305
+msgid "Sunday"
+msgstr "Domingo"
+
+#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274
+#: common/wdcal_edit.inc.php:308
+msgid "Monday"
+msgstr "Lunes"
+
+#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277
+msgid "Tuesday"
+msgstr "Martes"
+
+#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283
+msgid "Thursday"
+msgstr "Jueves"
+
+#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286
+msgid "Friday"
+msgstr "Viernes"
+
+#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289
+msgid "Saturday"
+msgstr "Sábado"
+
+#: common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr "Primer día de la semana:"
+
+#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr "Día del mes"
+
+#: common/wdcal_edit.inc.php:354
+msgid "#num#th of each month"
+msgstr "#num#th de cada mes"
+
+#: common/wdcal_edit.inc.php:357
+msgid "#num#th-last of each month"
+msgstr "#num#th-last de cada mes"
+
+#: common/wdcal_edit.inc.php:360
+msgid "#num#th #wkday# of each month"
+msgstr "#num#th #wkday# de cada mes"
+
+#: common/wdcal_edit.inc.php:363
+msgid "#num#th-last #wkday# of each month"
+msgstr "#num#th-last #wkday# de cada mes"
+
+#: common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr "#num#th del mes dado"
+
+#: common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr "#num#th-last del mes dado"
+
+#: common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr "#num#th #wkday# del mes dado"
+
+#: common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr "#num#th-last #wkday# del mes dado"
+
+#: common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr "Repetir hasta"
+
+#: common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr "Infinito"
+
+#: common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr "Hasta la siguiente fecha"
+
+#: common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr "Número de veces"
+
+#: common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#: common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr "Ninguno"
+
+#: common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr "Notificación"
+
+#: common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr "Notificar mediante"
+
+#: common/wdcal_edit.inc.php:468
+msgid "Remove"
+msgstr "Eliminar"
+
+#: common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr "El Friendica / Mostrar"
+
+#: common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr "Tiempo"
+
+#: common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr "Horas"
+
+#: common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr "Minutos"
+
+#: common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr "Segundos"
+
+#: common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr "Semanas"
+
+#: common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr "antes del"
+
+#: common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr "inicio del evento"
+
+#: common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr "fin del evento"
+
+#: common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr "Añadir una notificación"
+
+#: common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr "El evento #name# empezará el #date"
+
+#: common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr "#name# está a punto de empezar."
+
+#: common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr "Guardado"
+
+#: common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "EE.UU. Formato de Fecha (mm/dd/YYYY)"
+
+#: common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "Formato de fecha alemán (dd.mm.YYYY)"
+
+#: common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr "Eventos privados"
+
+#: common/wdcal_backend.inc.php:92 common/wdcal_backend.inc.php:166
+#: common/wdcal_backend.inc.php:178 common/wdcal_backend.inc.php:206
+#: common/wdcal_backend.inc.php:214 common/wdcal_backend.inc.php:229
+msgid "No access"
+msgstr "Sin acceso"
+
+#: common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Agenda Privada"
--- a/dav/lang/es/strings.php
+++ b/dav/lang/es/strings.php
@ -1,136 +1,141 @@
-<?php
-
-$a->strings["Friendica-Native events"] = "Eventos nativos de Friendica";
-$a->strings["Friendica-Contacts"] = "Contactos de Friendica";
-$a->strings["Your Friendica-Contacts"] = "Tus Contactos de Friendica";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Algo salió mal al importar el archivo. Lo sentimos. Puede que algunos eventos se hayan importado.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "Algo salió mal al importar el archivo. Lo sentimos.";
-$a->strings["The ICS-File has been imported."] = "El archivo ICS ha sido importado.";
-$a->strings["No file was uploaded."] = "No se ha importado ningún archivo.";
-$a->strings["Go back to the calendar"] = "Volver al calendario";
-$a->strings["Import a ICS-file"] = "Importar archivo ICS";
-$a->strings["ICS-File"] = "Archivo ICS";
-$a->strings["Overwrite all #num# existing events"] = "Sobreescribir los #num# eventos existentes";
-$a->strings["Upload"] = "Subir";
-$a->strings["Settings"] = "Configuración";
-$a->strings["Help"] = "Ayuda";
-$a->strings["New event"] = "Evento nuevo";
-$a->strings["Today"] = "Hoy";
-$a->strings["Day"] = "Día";
-$a->strings["Week"] = "Semana";
-$a->strings["Month"] = "Mes";
-$a->strings["Reload"] = "Recargar";
-$a->strings["Previous"] = "Previo";
-$a->strings["Next"] = "Siguiente";
-$a->strings["Date"] = "Fecha";
-$a->strings["Error"] = "Error";
-$a->strings["Permission denied."] = "Permiso denegado.";
-$a->strings["The new values have been saved."] = "Los nuevos valores se han guardado.";
-$a->strings["The calendar has been updated."] = "El calendario ha sido actualizado.";
-$a->strings["The new calendar has been created."] = "Se ha creado un nuevo calendario.";
-$a->strings["The calendar has been deleted."] = "El calendario se ha borrado.";
-$a->strings["Calendar Settings"] = "Configuración del Calendario";
-$a->strings["Date format"] = "Formato de fecha";
-$a->strings["Time zone"] = "Zona horaria";
-$a->strings["Save"] = "Guardar";
-$a->strings["Calendars"] = "Calendarios";
-$a->strings["Create a new calendar"] = "Crear un nuevo calendario";
-$a->strings["Limitations"] = "Limitaciones";
-$a->strings["Warning"] = "Aviso";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronización (iPhone, Thunderbird Lightning, Android...)";
-$a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizar este calendario con iPhone";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizar tus contactos de Friendica con iPhone";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versión actual de este módulo no se ha ajustado correctamente. Por favor contacta al administrador de sistema de tu instalación de Friendica para arreglarlo.";
-$a->strings["Calendar"] = "Calendario";
-$a->strings["Extended calendar with CalDAV-support"] = "Calendario ampliado con soporte CalDAV";
-$a->strings["noreply"] = "no responder";
-$a->strings["Notification: "] = "Notificación:";
-$a->strings["The database tables have been installed."] = "Se han instalado las tablas de la base de datos.";
-$a->strings["An error occurred during the installation."] = "Ha ocurrido un error durante la instalación.";
-$a->strings["The database tables have been updated."] = "Las tablas de la base de datos han sido actualizadas.";
-$a->strings["An error occurred during the update."] = "Ocurrió un error durante la actualización.";
-$a->strings["No system-wide settings yet."] = "No se han configurado aún los ajustes del sistema.";
-$a->strings["Database status"] = "Estado de la base de datos";
-$a->strings["Installed"] = "Instalada";
-$a->strings["Upgrade needed"] = "Actualización necesaria";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Por favor respalda todos los datos de calendario (las tablas que comienzan con dav_*) antes de continuar. Aunque todos los eventos de calendario <i>deberían</i> convertirse a la nueva estructura de base de datos, siempre es seguro tener un respaldo. Abajo, puedes ver las consultas a la base de datos que se realizarán cuando presiones el botón de 'actualizar'.";
-$a->strings["Upgrade"] = "Actualizada";
-$a->strings["Not installed"] = "Sin instalar";
-$a->strings["Install"] = "Instalar";
-$a->strings["Unknown"] = "Desconocido";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Ha ocurrido algo muy malo. No puedo recuperarme automáticamente de este estado, lo siento. Por favor ve al manejador de fondo de la base de datos, respalda los datos, y borra todas las tablas que comienzan con 'dav_' manualmente. Después de eso, esta rutina de instalación debería de ser capaz de reinicializar las tablas automáticamente.";
-$a->strings["Troubleshooting"] = "Problemas";
-$a->strings["Manual creation of the database tables:"] = "Manual para la creación de las tablas de la base de datos:";
-$a->strings["Show SQL-statements"] = "Mostrar declaraciones SQL";
-$a->strings["Private Calendar"] = "Calendario privado";
-$a->strings["Friendica Events: Mine"] = "Eventos de Friendica: Propios";
-$a->strings["Friendica Events: Contacts"] = "Eventos de Friendica: Contactos";
-$a->strings["Private Addresses"] = "Direcciones privadas";
-$a->strings["Friendica Contacts"] = "Contactos de Friendica";
-$a->strings["Could not open component for editing"] = "No se puede abrir para editar";
-$a->strings["Event data"] = "Datos del evento";
-$a->strings["Special color"] = "Color especial";
-$a->strings["Subject"] = "Asunto";
-$a->strings["Starts"] = "Comienzo";
-$a->strings["Ends"] = "Final";
-$a->strings["Location"] = "Ubicación";
-$a->strings["Description"] = "Descripción";
-$a->strings["Recurrence"] = "Recurrencia";
-$a->strings["Frequency"] = "Frecuencia";
-$a->strings["None"] = "Ninguna";
-$a->strings["Daily"] = "Diariamente";
-$a->strings["Weekly"] = "Semanalmente";
-$a->strings["Monthly"] = "Mensualmente";
-$a->strings["Yearly"] = "Anual";
-$a->strings["days"] = "días";
-$a->strings["weeks"] = "semanas";
-$a->strings["months"] = "meses";
-$a->strings["years"] = "años";
-$a->strings["Interval"] = "Intérvalo";
-$a->strings["All %select% %time%"] = "Todos %select% %time%";
-$a->strings["Days"] = "Días";
-$a->strings["Sunday"] = "Domingo";
-$a->strings["Monday"] = "Lunes";
-$a->strings["Tuesday"] = "Martes";
-$a->strings["Wednesday"] = "Miércoles";
-$a->strings["Thursday"] = "Jueves";
-$a->strings["Friday"] = "Viernes";
-$a->strings["Saturday"] = "Sábado";
-$a->strings["First day of week:"] = "Primer día de la semana:";
-$a->strings["Day of month"] = "Día del mes";
-$a->strings["#num#th of each month"] = "#num#º de cada mes";
-$a->strings["#num#th-last of each month"] = "#num#º antes del último de cada mes";
-$a->strings["#num#th #wkday# of each month"] = "#num#º #wkday# de cada mes";
-$a->strings["#num#th-last #wkday# of each month"] = "#num#º antes del último #wkday# de cada mes";
-$a->strings["#num#th of the given month"] = "#num#º del mes dado";
-$a->strings["#num#th-last of the given month"] = "#num#º antes del último del mes dado";
-$a->strings["#num#th #wkday# of the given month"] = "#num#º #wkday# del mes dado";
-$a->strings["#num#th-last #wkday# of the given month"] = "#num#º antes del último #wkday# del mes dado";
-$a->strings["Repeat until"] = "Repetir hasta";
-$a->strings["Infinite"] = "Infinito";
-$a->strings["Until the following date"] = "Hasta la fecha siguiente";
-$a->strings["Number of times"] = "Número de veces";
-$a->strings["Exceptions"] = "Excepciones";
-$a->strings["none"] = "ninguno";
-$a->strings["Notification"] = "Notificación";
-$a->strings["Notify by"] = "Notificar por";
-$a->strings["Remove"] = "Eliminar";
-$a->strings["E-Mail"] = "Correo electrónico";
-$a->strings["On Friendica / Display"] = "Sobre Friendica / Mostrar";
-$a->strings["Time"] = "Hora";
-$a->strings["Hours"] = "Horas";
-$a->strings["Minutes"] = "Minutos";
-$a->strings["Seconds"] = "Segundos";
-$a->strings["Weeks"] = "Semanas";
-$a->strings["before the"] = "antes de";
-$a->strings["start of the event"] = "inicio del evento";
-$a->strings["end of the event"] = "final del evento";
-$a->strings["Add a notification"] = "Añadir una notificación";
-$a->strings["The event #name# will start at #date"] = "El evento #name# comenzará el #date";
-$a->strings["#name# is about to begin."] = "#name# está a punto de comenzar.";
-$a->strings["Saved"] = "Guardado";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "Hora, formato anglosajón (mm/dd/aaaa)";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "Hora, formato europeo (dd.mm.aaaa)";
-$a->strings["Private Events"] = "Eventos privados";
-$a->strings["No access"] = "Sin acceso";
-$a->strings["Private Addressbooks"] = "Libretas de direcciones privada";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Friendica-Native events"] = "Eventos Nativos de Friendica";
+$a->strings["Friendica-Contacts"] = "Contactos de Friendica";
+$a->strings["Your Friendica-Contacts"] = "Sus contactos de Friendica";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Algo fue mal al intentar importar el archivo. Perdón. Quizá algunos eventos fueron importados de todas formas.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Algo fue mal al intentar importar el archivio. Perdón.";
+$a->strings["The ICS-File has been imported."] = "El archivo ICS ha sido importado.";
+$a->strings["No file was uploaded."] = "No se ha cargado en ningún archivo.";
+$a->strings["Go back to the calendar"] = "Volver al calendario";
+$a->strings["Import a ICS-file"] = "Importar un archivo ICS";
+$a->strings["ICS-File"] = "Archivo ICS";
+$a->strings["Overwrite all #num# existing events"] = "Sobreescribir todos los eventos #num# existentes";
+$a->strings["Upload"] = "Cargar";
+$a->strings["Settings"] = "Ajustes";
+$a->strings["Help"] = "Ayuda";
+$a->strings["New event"] = "Nuevo evento";
+$a->strings["Today"] = "Hoy";
+$a->strings["Day"] = "Día";
+$a->strings["Week"] = "Semana";
+$a->strings["Month"] = "Mes";
+$a->strings["Reload"] = "Recargar";
+$a->strings["Previous"] = "Anterior";
+$a->strings["Next"] = "Siguiente";
+$a->strings["Date"] = "Fecha";
+$a->strings["Error"] = "Error";
+$a->strings["Permission denied."] = "Permiso denegado.";
+$a->strings["The new values have been saved."] = "Los nuevos valores se han guardado.";
+$a->strings["The calendar has been updated."] = "El calendario se ha actualizado.";
+$a->strings["The new calendar has been created."] = "El nuevo calendario se ha creado.";
+$a->strings["The calendar has been deleted."] = "El calendario ha sido eliminado.";
+$a->strings["Calendar Settings"] = "Ajustes de calendario";
+$a->strings["Date format"] = "Formato de fecha";
+$a->strings["Time zone"] = "Zona horaria";
+$a->strings["Save"] = "Guardar";
+$a->strings["Calendars"] = "Calendarios";
+$a->strings["Create a new calendar"] = "Crear un nuevo calendario";
+$a->strings["Limitations"] = "Límites";
+$a->strings["Warning"] = "Advertencia";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronización (iPhone, Thunderbird Lightning, Android, ...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizar este calendario con el iPhone";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizar sus contactos de Friendica con el iPhone";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versión actual de este plugin no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto.";
+$a->strings["Calendar"] = "Calendario";
+$a->strings["Extended calendar with CalDAV-support"] = "Estendido el calendario con soporte CalDAV";
+$a->strings["noreply"] = "no responder";
+$a->strings["Notification: "] = "Notificación: ";
+$a->strings["The database tables have been installed."] = "Las tablas de bases de datos se han instalado.";
+$a->strings["An error occurred during the installation."] = "Hubo un error durante la instalación.";
+$a->strings["The database tables have been updated."] = "Las tablas de bases de datos se han actualizado.";
+$a->strings["An error occurred during the update."] = "Hubo un error durante la actualización.";
+$a->strings["No system-wide settings yet."] = "Aún no hay ajustes para todo el sistema.";
+$a->strings["Database status"] = "Estado de base de datos";
+$a->strings["Installed"] = "Instalado";
+$a->strings["Upgrade needed"] = "Actualización requerida";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Por favor haga una copia de seguridad de toda la información de calendario (las tablas que empiezan por dav_*) antes de proceder. Mientras todos los eventos de calendario <i>deberían</i> de ser convertidos a la nueva estructura de base de datos, siempre es seguro tener copia de seguridad. Debajo, puede echar un vistazo a las colsultas de base de datos que se crearán al presionar el botón 'actualizar'.";
+$a->strings["Upgrade"] = "Actualizar";
+$a->strings["Not installed"] = "No instalado";
+$a->strings["Install"] = "Instalar";
+$a->strings["Unknown"] = "Desconocido";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Algo fue realmente mal. No puedo recuperarme de este estado automáticamente, lo siento. Por favor vaya a la parte trasera de la base de datos, haga una copia de seguridad de la información, y elimine todas las tablas que empiecen por 'dav_' manualmente. Después de eso, esta rutina de instalación debería ser capaz de reiniciar las tablas automáticamente.";
+$a->strings["Troubleshooting"] = "Resolución de problemas";
+$a->strings["Manual creation of the database tables:"] = "Creación manual de las tablas de base de datos:";
+$a->strings["Show SQL-statements"] = "Mostrar declaraciones SQL";
+$a->strings["Private Calendar"] = "Calendario Privado";
+$a->strings["Friendica Events: Mine"] = "Eventos de Friendica: Mío";
+$a->strings["Friendica Events: Contacts"] = "Efentos de Friendica: Contactos";
+$a->strings["Private Addresses"] = "Direcciones Privadas";
+$a->strings["Friendica Contacts"] = "Contactos de Friendica";
+$a->strings["Could not open component for editing"] = "Podría no abrir el componente para editar";
+$a->strings["Event data"] = "Información de evento";
+$a->strings["Special color"] = "Color especial";
+$a->strings["Subject"] = "Tema";
+$a->strings["Starts"] = "Empieza";
+$a->strings["Ends"] = "Termina";
+$a->strings["Location"] = "Ubicación";
+$a->strings["Description"] = "Descripción";
+$a->strings["Recurrence"] = "Repetición";
+$a->strings["Frequency"] = "Frecuencia";
+$a->strings["None"] = "Ninguno";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensual";
+$a->strings["Yearly"] = "Anualmente";
+$a->strings["days"] = "días";
+$a->strings["weeks"] = "semanas";
+$a->strings["months"] = "meses";
+$a->strings["years"] = "años";
+$a->strings["Interval"] = "intervalo";
+$a->strings["All %select% %time%"] = "Todo el %select% %time%";
+$a->strings["Days"] = "Días";
+$a->strings["Sunday"] = "Domingo";
+$a->strings["Monday"] = "Lunes";
+$a->strings["Tuesday"] = "Martes";
+$a->strings["Wednesday"] = "Miércoles";
+$a->strings["Thursday"] = "Jueves";
+$a->strings["Friday"] = "Viernes";
+$a->strings["Saturday"] = "Sábado";
+$a->strings["First day of week:"] = "Primer día de la semana:";
+$a->strings["Day of month"] = "Día del mes";
+$a->strings["#num#th of each month"] = "#num#th de cada mes";
+$a->strings["#num#th-last of each month"] = "#num#th-last de cada mes";
+$a->strings["#num#th #wkday# of each month"] = "#num#th #wkday# de cada mes";
+$a->strings["#num#th-last #wkday# of each month"] = "#num#th-last #wkday# de cada mes";
+$a->strings["#num#th of the given month"] = "#num#th del mes dado";
+$a->strings["#num#th-last of the given month"] = "#num#th-last del mes dado";
+$a->strings["#num#th #wkday# of the given month"] = "#num#th #wkday# del mes dado";
+$a->strings["#num#th-last #wkday# of the given month"] = "#num#th-last #wkday# del mes dado";
+$a->strings["Repeat until"] = "Repetir hasta";
+$a->strings["Infinite"] = "Infinito";
+$a->strings["Until the following date"] = "Hasta la siguiente fecha";
+$a->strings["Number of times"] = "Número de veces";
+$a->strings["Exceptions"] = "Excepciones";
+$a->strings["none"] = "Ninguno";
+$a->strings["Notification"] = "Notificación";
+$a->strings["Notify by"] = "Notificar mediante";
+$a->strings["Remove"] = "Eliminar";
+$a->strings["E-Mail"] = "E-Mail";
+$a->strings["On Friendica / Display"] = "El Friendica / Mostrar";
+$a->strings["Time"] = "Tiempo";
+$a->strings["Hours"] = "Horas";
+$a->strings["Minutes"] = "Minutos";
+$a->strings["Seconds"] = "Segundos";
+$a->strings["Weeks"] = "Semanas";
+$a->strings["before the"] = "antes del";
+$a->strings["start of the event"] = "inicio del evento";
+$a->strings["end of the event"] = "fin del evento";
+$a->strings["Add a notification"] = "Añadir una notificación";
+$a->strings["The event #name# will start at #date"] = "El evento #name# empezará el #date";
+$a->strings["#name# is about to begin."] = "#name# está a punto de empezar.";
+$a->strings["Saved"] = "Guardado";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "EE.UU. Formato de Fecha (mm/dd/YYYY)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "Formato de fecha alemán (dd.mm.YYYY)";
+$a->strings["Private Events"] = "Eventos privados";
+$a->strings["No access"] = "Sin acceso";
+$a->strings["Private Addressbooks"] = "Agenda Privada";
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@ -0,0 +1,263 @@
+<?php
+/**
+ * Super-skeletal class to interact with Diaspora.
+ *
+ * @author Meitar Moscovitz <meitarm@gmail.com>
+ * Modifications by Michael Vogel <heluecht@pirati.ca>
+ */
+
+class Diaspora_Connection {
+	private $user;
+	private $host;
+	private $password;
+	private $tls = true; //< Whether to use an SSL/TLS connection or not.
+
+	private $last_http_result; //< Result of last cURL transaction.
+	private $csrf_token; //< Authenticity token retrieved from last HTTP response.
+	private $http_method; //< Which HTTP verb to use for the next HTTP request.
+	private $cookiejar;
+
+	private $debug_log;
+
+	public $provider = '*Diaspora Connection';
+
+	public function __construct($diaspora_handle = '', $password = '') {
+		if (!empty($diaspora_handle)) {
+			$this->setDiasporaID($diaspora_handle);
+		}
+		if (!empty($password)) {
+			$this->setPassword($password);
+		}
+
+		$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies');
+		return $this;
+	}
+
+	public function __destruct() {
+		if (file_exists($this->cookiejar)) {
+			unlink($this->cookiejar);
+		}
+	}
+
+	public function setDebugLog($log_file) {
+		$this->debug_log = $log_file;
+	}
+
+	public function setDiasporaID($id) {
+		$parts = explode('@', $id);
+		$this->user = $parts[0];
+		$this->host = $parts[1];
+	}
+
+	public function getDiasporaID() {
+		return $this->user . '@' . $this->host;
+	}
+
+	public function getPodURL() {
+		return $this->getScheme() . '://' . $this->host;
+	}
+
+	public function setPassword($passwd) {
+		$this->password = $passwd;
+	}
+
+	public function setSecureTransport($is_secure) {
+		$this->tls = (bool) $is_secure;
+	}
+
+	private function getScheme() {
+		return ($this->tls) ? 'https' : 'http';
+	}
+
+	private function doHttpRequest($url, $data = array(), $headers = array()) {
+		if (0 === strpos($url, '/')) {
+			$url = $this->getScheme() . '://' . $this->host . $url;
+		}
+
+		$ch = curl_init($url);
+
+		if ($this->debug_log) {
+			curl_setopt($ch, CURLOPT_VERBOSE, true);
+			$fh = fopen($this->debug_log, 'a');
+			curl_setopt($ch, CURLOPT_STDERR, $fh);
+		}
+
+		curl_setopt($ch, CURLOPT_HEADER, true);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+		if (!empty($data)) {
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		}
+		if (!empty($headers)) {
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+		}
+
+		curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
+		curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
+
+		// Are we doing a special kind of HTTP request?
+		switch ($this->http_method) {
+			case 'DELETE':
+				curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->http_method);
+				break;
+			case 'POST':
+				curl_setopt($ch, CURLOPT_POST, true);
+				break;
+		}
+
+		$this->last_http_result = new stdClass();
+		$this->last_http_result->response = curl_exec($ch);
+		$this->last_http_result->info = curl_getinfo($ch);
+		curl_close($ch);
+		if (isset($fh)) {
+			fclose($fh);
+		}
+
+		// Maybe update CSRF token
+		$token = $this->parseAuthenticityToken($this->last_http_result->response);
+		if ($token) {
+			$this->csrf_token = $token;
+		}
+
+		return $this->last_http_result;
+	}
+
+	private function doHttpDelete($url, $data = array(), $headers = array()) {
+		$this->http_method = 'DELETE';
+		$this->doHttpRequest($url, $data, $headers);
+		$this->http_method = null; // reset for next request
+	}
+
+	private function parseAuthenticityToken($str) {
+		$m = array();
+		preg_match('/<meta (?:name="csrf-token" content="(.*?)"|content="(.*?)" name="csrf-token")/', $str, $m);
+		if (empty($m[1]) && !empty($m[2])) {
+			$token = $m[2];
+		} elseif (!empty($m[1])) {
+			$token = $m[1];
+		}
+		return (!empty($token)) ? $token : false;
+	}
+
+	private function readJsonResponse($response) {
+		$lines = explode("\r\n", $response);
+		$x = array_splice(
+			$lines, array_search('', $lines) + 1 // empty, as "\r\n" was explode()'d
+		);
+		$http_body = array_pop($x);
+		return json_decode($http_body);
+	}
+
+	public function logIn() {
+		$this->doHttpRequest('/users/sign_in');
+
+		$params = array(
+			'user[username]' => $this->user,
+			'user[password]' => $this->password,
+			'authenticity_token' => $this->csrf_token
+		);
+		$this->doHttpRequest('/users/sign_in', $params);
+		$this->doHttpRequest('/stream');
+		return (200 === $this->last_http_result->info['http_code']) ? true : false;
+	}
+
+	public function getAspects() {
+		$this->doHttpRequest('/bookmarklet');
+		$m = array();
+		preg_match('/"aspects"\:(\[.+?\])/', $this->last_http_result->response, $m);
+		return (!empty($m[1])) ? json_decode($m[1]) : false;
+	}
+
+	public function getServices() {
+		$this->doHttpRequest('/bookmarklet');
+		$m = array();
+		preg_match('/"configured_services"\:(\[.+?\])/', $this->last_http_result->response, $m);
+		return (!empty($m[1])) ? json_decode($m[1]) : false;
+	}
+
+	public function getNotifications($notification_type = '', $show = '') {
+		$url = '/notifications?format=json';
+
+		if (!empty($notification_type)) {
+			$url .= "&type=$notification_type";
+		}
+
+		if ('unread' === $show) {
+			$url .= '&show=unread';
+		}
+
+		$this->doHttpRequest($url);
+		return $this->readJsonResponse($this->last_http_result->response);
+	}
+
+	public function getComments($post_id) {
+		$url = "/posts/$post_id/comments?format=json";
+		$this->doHttpRequest($url);
+		return $this->readJsonResponse($this->last_http_result->response);
+	}
+
+	public function postStatusMessage($msg, $aspect_ids = 'all_aspects', $additional_data = array()) {
+		$data = array(
+			'aspect_ids' => $aspect_ids,
+			'status_message' => array(
+				'text' => $msg,
+				'provider_display_name' => $this->provider
+			)
+		);
+
+		if (!empty($additional_data)) {
+			$data += $additional_data;
+		}
+
+		$headers = array(
+			'Content-Type: application/json',
+			'Accept: application/json',
+			'X-CSRF-Token: ' . $this->csrf_token
+		);
+
+		$this->http_method = 'POST';
+		$this->doHttpRequest('/status_messages', json_encode($data), $headers);
+		$this->http_method = null; // reset for next request
+		if (201 !== $this->last_http_result->info['http_code']) {
+			// TODO: Handle error.
+			return false;
+		} elseif (200 !== $this->last_http_result->info['http_code']) {
+			$resp = $this->readJsonResponse($this->last_http_result->response);
+			return $resp->id;
+		}
+	}
+
+	public function postPhoto($file) {
+		$params = array(
+			'photo[pending]' => 'true',
+			'qqfile' => basename($file)
+		);
+		$query_string = '?' . http_build_query($params);
+		$headers = array(
+			'Accept: application/json',
+			'X-Requested-With: XMLHttpRequest',
+			'X-CSRF-Token: ' . $this->csrf_token,
+			'X-File-Name: ' . basename($file),
+			'Content-Type: application/octet-stream',
+		);
+		if ($size = @filesize($file)) {
+			$headers[] = "Content-Length: $size";
+		}
+		$data = file_get_contents($file);
+		$this->doHttpRequest('/photos' . $query_string, $data, $headers);
+		return $this->readJsonResponse($this->last_http_result->response);
+	}
+
+	public function deletePost($id) {
+		$headers = array('X-CSRF-Token: ' . $this->csrf_token);
+		$this->doHttpDelete("/posts/$id", array(), $headers);
+		return (204 === $this->last_http_result->info['http_code']) ? true : false;
+	}
+
+	public function deleteComment($id) {
+		$headers = array('X-CSRF-Token: ' . $this->csrf_token);
+		$this->doHttpDelete("/comments/$id", array(), $headers);
+		return (204 === $this->last_http_result->info['http_code']) ? true : false;
+	}
+
+}
--- a/diaspora/diaspora.css
+++ b/diaspora/diaspora.css
@ -1,11 +1,11 @@

-#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-url-label, #diaspora-bydefault-label {
+#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-bydefault-label, #diaspora-aspect-label {
 	float: left;
 	width: 200px;
 	margin-top: 10px;
 }

-#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-url, #diaspora-bydefault {
+#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-bydefault, #diaspora-aspect {
 	float: left;
 	margin-top: 10px;
 }
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@ -3,11 +3,12 @@
 /**
 * Name: Diaspora Post Connector
 * Description: Post to Diaspora
- * Version: 0.1
+ * Version: 0.2
 * Author: Michael Vogel <heluecht@pirati.ca>
- * Status: Unsupported
 */

+require_once("addon/diaspora/Diaspora_Connection.php");
+
 function diaspora_install() {
 	register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
 	register_hook('notifier_normal',      'addon/diaspora/diaspora.php', 'diaspora_send');
@ -65,16 +66,14 @@ function diaspora_queue_hook(&$a,&$b) {

 		$userdata = $r[0];

-		$diaspora_username = get_pconfig($userdata['uid'],'diaspora','diaspora_username');
-		$diaspora_password = get_pconfig($userdata['uid'],'diaspora','diaspora_password');
-		$diaspora_url = get_pconfig($userdata['uid'],'diaspora','diaspora_url');
+		$handle = get_pconfig($userdata['uid'],'diaspora','handle');
+		$password = get_pconfig($userdata['uid'],'diaspora','password');
+		$aspect = get_pconfig($userdata['uid'],'diaspora','aspect');

 		$success = false;

-		if($diaspora_url && $diaspora_username && $diaspora_password) {
-			require_once("addon/diaspora/diasphp.php");
-
-                        logger('diaspora_queue: able to post for user '.$diaspora_username);
+		if ($handle && $password) {
+                        logger('diaspora_queue: able to post for user '.$handle);

 			$z = unserialize($x['content']);

@ -84,11 +83,12 @@ function diaspora_queue_hook(&$a,&$b) {

 			try {
 				logger('diaspora_queue: prepare', LOGGER_DEBUG);
-				$conn = new Diasphp($diaspora_url);
-				logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG);
-				$conn->login($diaspora_username, $diaspora_password);
+				$conn = new Diaspora_Connection($handle, $password);
+				logger('diaspora_queue: try to log in '.$handle, LOGGER_DEBUG);
+				$conn->logIn();
 				logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
-				$conn->post($post, $hostname);
+				$conn->provider = $hostname;
+				$conn->postStatusMessage($post, $aspect);

                                logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);

@ -127,20 +127,27 @@ function diaspora_settings(&$a,&$s) {

 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');

-	$diaspora_username = get_pconfig(local_user(), 'diaspora', 'diaspora_username');
-	$diaspora_password = get_pconfig(local_user(), 'diaspora', 'diaspora_password');
-	$diaspora_url = get_pconfig(local_user(), 'diaspora', 'diaspora_url');
+	$handle = get_pconfig(local_user(), 'diaspora', 'handle');
+	$password = get_pconfig(local_user(), 'diaspora', 'password');
+	$aspect = get_pconfig(local_user(),'diaspora','aspect');

 	$status = "";

-	if ($diaspora_username AND $diaspora_password AND $diaspora_url) {
-		try {
-			require_once("addon/diaspora/diasphp.php");
+	$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
+	if (dbm::is_result($r)) {
+		$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
+		$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+		$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
+	}

-			$conn = new Diasphp($diaspora_url);
-			$conn->login($diaspora_username, $diaspora_password);
-		} catch (Exception $e) {
-			$status = t("Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)");
+	$aspects = false;
+
+	if ($handle AND $password) {
+		$conn = new Diaspora_Connection($handle, $password);
+		$conn->logIn();
+		$aspects = $conn->getAspects();
+		if (!$aspects) {
+			$status = t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
 		}
 	}

@ -166,19 +173,38 @@ function diaspora_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';

 	$s .= '<div id="diaspora-username-wrapper">';
-	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . t('Diaspora username') . '</label>';
-	$s .= '<input id="diaspora-username" type="text" name="diaspora_username" value="' . $diaspora_username . '" />';
+	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . t('Diaspora handle') . '</label>';
+	$s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
 	$s .= '</div><div class="clear"></div>';

 	$s .= '<div id="diaspora-password-wrapper">';
 	$s .= '<label id="diaspora-password-label" for="diaspora-password">' . t('Diaspora password') . '</label>';
-	$s .= '<input id="diaspora-password" type="password" name="diaspora_password" value="' . $diaspora_password . '" />';
+	$s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
 	$s .= '</div><div class="clear"></div>';

-	$s .= '<div id="diaspora-url-wrapper">';
-	$s .= '<label id="diaspora-url-label" for="diaspora-url">' . t('Diaspora site URL') . '</label>';
-	$s .= '<input id="diaspora-url" type="text" name="diaspora_url" value="' . $diaspora_url . '" />';
-	$s .= '</div><div class="clear"></div>';
+	if ($aspects) {
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'all_aspects';
+		$single_aspect->name = t('All aspects');
+		$aspects[] = $single_aspect;
+
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'public';
+		$single_aspect->name = t('Public');
+		$aspects[] = $single_aspect;
+
+		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . t('Post to aspect:') . '</label>';
+		$s .= '<select name="aspect" id="diaspora-aspect">';
+		foreach($aspects as $single_aspect) {
+			if ($single_aspect->id == $aspect)
+				$s .= "<option value='".$single_aspect->id."' selected>".$single_aspect->name."</option>";
+			else
+				$s .= "<option value='".$single_aspect->id."'>".$single_aspect->name."</option>";
+		}
+
+		$s .= "</select>";
+		$s .= '<div class="clear"></div>';
+	}

 	$s .= '<div id="diaspora-bydefault-wrapper">';
 	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . t('Post to Diaspora by default') . '</label>';
@ -198,10 +224,9 @@ function diaspora_settings_post(&$a,&$b) {

 		set_pconfig(local_user(),'diaspora','post',intval($_POST['diaspora']));
 		set_pconfig(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault']));
-		set_pconfig(local_user(),'diaspora','diaspora_username',trim($_POST['diaspora_username']));
-		set_pconfig(local_user(),'diaspora','diaspora_password',trim($_POST['diaspora_password']));
-		set_pconfig(local_user(),'diaspora','diaspora_url',trim($_POST['diaspora_url']));
-
+		set_pconfig(local_user(),'diaspora','handle',trim($_POST['handle']));
+		set_pconfig(local_user(),'diaspora','password',trim($_POST['password']));
+		set_pconfig(local_user(),'diaspora','aspect',trim($_POST['aspect']));
 	}

 }
@ -251,11 +276,11 @@ function diaspora_send(&$a,&$b) {

 	logger('diaspora_send: prepare posting', LOGGER_DEBUG);

-	$diaspora_username = get_pconfig($b['uid'],'diaspora','diaspora_username');
-	$diaspora_password = get_pconfig($b['uid'],'diaspora','diaspora_password');
-	$diaspora_url = get_pconfig($b['uid'],'diaspora','diaspora_url');
+	$handle = get_pconfig($b['uid'],'diaspora','handle');
+	$password = get_pconfig($b['uid'],'diaspora','password');
+	$aspect = get_pconfig($b['uid'],'diaspora','aspect');

-	if($diaspora_url && $diaspora_username && $diaspora_password) {
+	if ($handle && $password) {

 		logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);

@ -301,13 +326,13 @@ function diaspora_send(&$a,&$b) {

 		try {
 			logger('diaspora_send: prepare', LOGGER_DEBUG);
-			$conn = new Diasphp($diaspora_url);
-			logger('diaspora_send: try to log in '.$diaspora_username, LOGGER_DEBUG);
-			$conn->login($diaspora_username, $diaspora_password);
+			$conn = new Diaspora_Connection($handle, $password);
+			logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
+			$conn->logIn();
 			logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);

-			//throw new Exception('Test');
-			$conn->post($body, $hostname);
+			$conn->provider = $hostname;
+			$conn->postStatusMessage($body, $aspect);

 			logger('diaspora_send: success');
 		} catch (Exception $e) {
--- a/diaspora/lang/it/messages.po
+++ b/diaspora/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 11:57+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/dwpost/lang/es/messages.po
+++ b/dwpost/lang/es/messages.po
@ -0,0 +1,48 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:33+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "Publicar en Dreamwidth"
+
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Ajustes de publicación de Dreamwidth"
+
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Activar el plugin de publicación dreamwidth"
+
+#: dwpost.php:77
+msgid "dreamwidth username"
+msgstr "Nombre de usuario de dreamwidth"
+
+#: dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Contraseña de dreamwidth"
+
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Publicar en dreamwidth por defecto"
+
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Enviar"
--- a/dwpost/lang/es/strings.php
+++ b/dwpost/lang/es/strings.php
@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Configuración de las publicaciones en Dreamwidth";
-$a->strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicación en Dreamwidth";
-$a->strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth";
-$a->strings["dreamwidth password"] = "Contraseña de Dreamwidth";
-$a->strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Ajustes de publicación de Dreamwidth";
+$a->strings["Enable dreamwidth Post Plugin"] = "Activar el plugin de publicación dreamwidth";
+$a->strings["dreamwidth username"] = "Nombre de usuario de dreamwidth";
+$a->strings["dreamwidth password"] = "Contraseña de dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publicar en dreamwidth por defecto";
+$a->strings["Submit"] = "Enviar";
--- a/dwpost/lang/it/messages.po
+++ b/dwpost/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2014-10-22 07:54+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/editplain/lang/es/messages.po
+++ b/editplain/lang/es/messages.po
@ -0,0 +1,36 @@
+# ADDON editplain
+# Copyright (C)
+# This file is distributed under the same license as the Friendica editplain addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:35+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Ajustes de edición sencillos actualizados."
+
+#: editplain.php:76
+msgid "Editplain Settings"
+msgstr "Ajustes de edición sencillos"
+
+#: editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Desactivar el editor de texto enriquecido del estatus"
+
+#: editplain.php:84
+msgid "Submit"
+msgstr "Enviar"
--- a/editplain/lang/es/strings.php
+++ b/editplain/lang/es/strings.php
@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Editplain settings updated."] = "Configuración del Editor de texto plano actualizada.";
-$a->strings["Editplain Settings"] = "Configuración del Editor de texto plano";
-$a->strings["Disable richtext status editor"] = "Desactivar el editor de texto enriquecido";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Editplain settings updated."] = "Ajustes de edición sencillos actualizados.";
+$a->strings["Editplain Settings"] = "Ajustes de edición sencillos";
+$a->strings["Disable richtext status editor"] = "Desactivar el editor de texto enriquecido del estatus";
+$a->strings["Submit"] = "Enviar";
--- a/editplain/lang/it/messages.po
+++ b/editplain/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2014-10-22 07:54+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/forumdirectory/lang/es/messages.po
+++ b/forumdirectory/lang/es/messages.po
@ -0,0 +1,80 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:38+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:22
+msgid "Forum Directory"
+msgstr "Directorio de foro"
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr "Acceso público denegado."
+
+#: forumdirectory.php:71
+msgid "Global Directory"
+msgstr "Directorio global"
+
+#: forumdirectory.php:79
+msgid "Find on this site"
+msgstr "Encontrar en esta página"
+
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Conclusión:"
+
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Directorio de página"
+
+#: forumdirectory.php:83
+msgid "Find"
+msgstr "Encontrar"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Edad:"
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Género:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Ubicación:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Género:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Estado:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Página inicial:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Sobre:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
--- a/forumdirectory/lang/es/strings.php
+++ b/forumdirectory/lang/es/strings.php
@ -1,16 +1,22 @@
-<?php
-
-$a->strings["Public access denied."] = "Acceso público denegado.";
-$a->strings["Global Directory"] = "Directorio global";
-$a->strings["Find on this site"] = "Buscar en este sitio";
-$a->strings["Finding: "] = "Buscando: ";
-$a->strings["Site Directory"] = "Directorio del sitio";
-$a->strings["Find"] = "Buscar";
-$a->strings["Age: "] = "Edad: ";
-$a->strings["Gender: "] = "Género:";
-$a->strings["Location:"] = "Localización:";
-$a->strings["Gender:"] = "Género:";
-$a->strings["Status:"] = "Estado:";
-$a->strings["Homepage:"] = "Página de inicio:";
-$a->strings["About:"] = "Acerca de:";
-$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas).";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Forum Directory"] = "Directorio de foro";
+$a->strings["Public access denied."] = "Acceso público denegado.";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Find on this site"] = "Encontrar en esta página";
+$a->strings["Finding: "] = "Conclusión:";
+$a->strings["Site Directory"] = "Directorio de página";
+$a->strings["Find"] = "Encontrar";
+$a->strings["Age: "] = "Edad:";
+$a->strings["Gender: "] = "Género:";
+$a->strings["Location:"] = "Ubicación:";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página inicial:";
+$a->strings["About:"] = "Sobre:";
+$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
--- a/forumdirectory/lang/it/messages.po
+++ b/forumdirectory/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2014-09-10 12:04+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/forumlist/lang/es/messages.po
+++ b/forumlist/lang/es/messages.po
@ -0,0 +1,60 @@
+# ADDON forumlist
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumlist addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:41+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumlist.php:64
+msgid "Forums"
+msgstr "Foros"
+
+#: forumlist.php:67
+msgid "show/hide"
+msgstr "mostrar/ocultar"
+
+#: forumlist.php:81
+msgid "No forum subscriptions"
+msgstr "Sin subscripciones de foro"
+
+#: forumlist.php:98
+msgid "Forums:"
+msgstr "Foros:"
+
+#: forumlist.php:134
+msgid "Forumlist settings updated."
+msgstr "Ajustes de la lista de foros actualizados."
+
+#: forumlist.php:162
+msgid "Forumlist Settings"
+msgstr "Ajustes de la lista de foros"
+
+#: forumlist.php:164
+msgid "Randomise forum list"
+msgstr "Aleatorizar la lista de foros"
+
+#: forumlist.php:167
+msgid "Show forums on profile page"
+msgstr "Mostrar foros en la página de perfil"
+
+#: forumlist.php:170
+msgid "Show forums on network page"
+msgstr "Mostrar foros en la página de red"
+
+#: forumlist.php:178
+msgid "Submit"
+msgstr "Enviar"
--- a/forumlist/lang/es/strings.php
+++ b/forumlist/lang/es/strings.php
@ -1,12 +1,17 @@
-<?php
-
-$a->strings["Forums"] = "Foros";
-$a->strings["show/hide"] = "mostrar/ocultar";
-$a->strings["No forum subscriptions"] = "Foro sin suscrpciones";
-$a->strings["Forums:"] = "Foros:";
-$a->strings["Forumlist settings updated."] = "Ajustes de lista de foros actualizados.";
-$a->strings["Forumlist Settings"] = "Ajustes de lista de foros";
-$a->strings["Randomise forum list"] = "";
-$a->strings["Show forums on profile page"] = "";
-$a->strings["Show forums on network page"] = "";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Forums"] = "Foros";
+$a->strings["show/hide"] = "mostrar/ocultar";
+$a->strings["No forum subscriptions"] = "Sin subscripciones de foro";
+$a->strings["Forums:"] = "Foros:";
+$a->strings["Forumlist settings updated."] = "Ajustes de la lista de foros actualizados.";
+$a->strings["Forumlist Settings"] = "Ajustes de la lista de foros";
+$a->strings["Randomise forum list"] = "Aleatorizar la lista de foros";
+$a->strings["Show forums on profile page"] = "Mostrar foros en la página de perfil";
+$a->strings["Show forums on network page"] = "Mostrar foros en la página de red";
+$a->strings["Submit"] = "Enviar";
--- a/forumlist/lang/sv/messages.po
+++ b/forumlist/lang/sv/messages.po
@ -0,0 +1,60 @@
+# ADDON forumlist
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumlist addon package.
+# 
+# 
+# Translators:
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-02-13 20:15+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumlist.php:64
+msgid "Forums"
+msgstr "Forum"
+
+#: forumlist.php:67
+msgid "show/hide"
+msgstr ""
+
+#: forumlist.php:81
+msgid "No forum subscriptions"
+msgstr ""
+
+#: forumlist.php:98
+msgid "Forums:"
+msgstr ""
+
+#: forumlist.php:134
+msgid "Forumlist settings updated."
+msgstr ""
+
+#: forumlist.php:162
+msgid "Forumlist Settings"
+msgstr ""
+
+#: forumlist.php:164
+msgid "Randomise forum list"
+msgstr ""
+
+#: forumlist.php:167
+msgid "Show forums on profile page"
+msgstr ""
+
+#: forumlist.php:170
+msgid "Show forums on network page"
+msgstr ""
+
+#: forumlist.php:178
+msgid "Submit"
+msgstr "Spara"
--- a/forumlist/lang/sv/strings.php
+++ b/forumlist/lang/sv/strings.php
@ -1,3 +1,17 @@
-<?php
-
-$a->strings["Submit"] = "Spara";
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Forums"] = "Forum";
+$a->strings["show/hide"] = "";
+$a->strings["No forum subscriptions"] = "";
+$a->strings["Forums:"] = "";
+$a->strings["Forumlist settings updated."] = "";
+$a->strings["Forumlist Settings"] = "";
+$a->strings["Randomise forum list"] = "";
+$a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
+$a->strings["Submit"] = "Spara";
--- a/fromapp/lang/es/messages.po
+++ b/fromapp/lang/es/messages.po
@ -0,0 +1,41 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 13:48+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "Ajustes de Fromapp actualizados."
+
+#: fromapp.php:64
+msgid "FromApp Settings"
+msgstr "Ajustes de FromApp"
+
+#: fromapp.php:66
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr "El nombre de la aplicación desde la que le gustaría que se mostrasen sus publicaciones."
+
+#: fromapp.php:70
+msgid "Use this application name even if another application was used."
+msgstr "Utilice este nombre de aplicación incluso si otra aplicación fue utilizada."
+
+#: fromapp.php:77
+msgid "Submit"
+msgstr "Enviar"
--- a/fromapp/lang/es/strings.php
+++ b/fromapp/lang/es/strings.php
@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Fromapp settings updated."] = "";
-$a->strings["FromApp Settings"] = "";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Fromapp settings updated."] = "Ajustes de Fromapp actualizados.";
+$a->strings["FromApp Settings"] = "Ajustes de FromApp";
+$a->strings["The application name you would like to show your posts originating from."] = "El nombre de la aplicación desde la que le gustaría que se mostrasen sus publicaciones.";
+$a->strings["Use this application name even if another application was used."] = "Utilice este nombre de aplicación incluso si otra aplicación fue utilizada.";
+$a->strings["Submit"] = "Enviar";
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@ -10,6 +10,8 @@
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes

 require_once('mod/share.php');
+require_once('mod/parse_url.php');
+require_once('include/text.php');

 function fromgplus_install() {
 	register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@ -38,6 +40,7 @@ function fromgplus_addon_settings(&$a,&$s) {
 		return;

 	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+	$keywords_checked = (intval(get_pconfig(local_user(), 'fromgplus', 'keywords')) ? ' checked="checked"' : '');
 	$account = get_pconfig(local_user(),'fromgplus','account');

 	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
@ -56,6 +59,9 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$s .= '<label id="fromgplus-label" for="fromgplus-account">'.t('Google Account ID').' </label>';
 	$s .= '<input id="fromgplus-account" type="text" name="fromgplus-account" value="'.$account.'" />';
 	$s .= '</div><div class="clear"></div>';
+	$s .= '<label id="fromgplus-keywords-label" for="fromgplus-keywords">'.t('Add keywords to post').'</label>';
+	$s .= '<input id="fromgplus-keywords" type="checkbox" name="fromgplus-keywords" value="1"'.$keywords_checked.' />';
+	$s .= '<div class="clear"></div>';

 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
 class="settings-submit" value="' . t('Save Settings') . '" /></div>';
@ -73,6 +79,8 @@ function fromgplus_addon_settings_post(&$a,&$b) {
 		set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
 		$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
 		set_pconfig(local_user(),'fromgplus','enable', $enable);
+		$keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+		set_pconfig(local_user(),'fromgplus', 'keywords', $keywords);

 		if (!$enable)
 			del_pconfig(local_user(),'fromgplus','lastdate');
@ -129,7 +137,7 @@ function fromgplus_cron($a,$b) {
 	set_config('fromgplus','last_poll', time());
 }

-function fromgplus_post($a, $uid, $source, $body, $location, $coord) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {

 	//$uid = 2;

@ -157,6 +165,10 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord) {
 	$_REQUEST['source'] = $source;
 	$_REQUEST['extid'] = NETWORK_GPLUS;

+	if (isset($id)) {
+		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+	}
+
 	// $_REQUEST['verb']
 	// $_REQUEST['parent']
 	// $_REQUEST['parent_uri']
@ -324,6 +336,11 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 				if ($quote != "")
 					$pagedata["text"] = $quote;

+				// Add Keywords to page link
+				$data = parseurl_getsiteinfo_cached($pagedata["url"], true);
+				if (isset($data["keywords"]) AND get_pconfig($uid, 'fromgplus', 'keywords')) {
+					$pagedata["keywords"] = $data["keywords"];
+				}
 				break;

 			case "photo":
@ -446,6 +463,8 @@ function fromgplus_fetch($a, $uid) {
 		if ($lastdate < strtotime($item->published))
 			$lastdate = strtotime($item->published);

+		set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+
 		if ($first_time)
 			continue;

@ -479,7 +498,7 @@ function fromgplus_fetch($a, $uid) {
 					} elseif (isset($item->address))
 						$location = $item->address;

-					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);

 					break;

@ -530,7 +549,7 @@ function fromgplus_fetch($a, $uid) {
 					} elseif (isset($item->address))
 						$location = $item->address;

-					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord);
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
 					break;
 			}
 		}
--- a/fromgplus/lang/C/messages.po
+++ b/fromgplus/lang/C/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2016-11-12 16:52+0000\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"
@ -17,22 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: fromgplus.php:33
-msgid "Google+ Import Settings"
+#: fromgplus.php:46 fromgplus.php:50
+msgid "Google+ Mirror"
 msgstr ""

-#: fromgplus.php:36
+#: fromgplus.php:55
 msgid "Enable Google+ Import"
 msgstr ""

-#: fromgplus.php:39
+#: fromgplus.php:58
 msgid "Google Account ID"
 msgstr ""

-#: fromgplus.php:44
-msgid "Submit"
+#: fromgplus.php:61
+msgid "Add keywords to post"
 msgstr ""

-#: fromgplus.php:59
+#: fromgplus.php:66 fromgplus.php:95
+msgid "Save Settings"
+msgstr ""
+
+#: fromgplus.php:87
 msgid "Google+ Import Settings saved."
 msgstr ""
+
+#: fromgplus.php:96
+msgid "Key"
+msgstr ""
+
+#: fromgplus.php:103
+msgid "Settings updated."
+msgstr ""
--- a/fromgplus/lang/de/messages.po
+++ b/fromgplus/lang/de/messages.po
@ -4,37 +4,50 @@
 # 
 # 
 # Translators:
-# Abrax <webmaster@a-zwenkau.de>, 2014
+# Andreas H., 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-10-15 12:28+0000\n"
-"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"POT-Creation-Date: 2016-11-12 16:52+0000\n"
+"PO-Revision-Date: 2016-11-17 06:41+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: fromgplus.php:33
-msgid "Google+ Import Settings"
-msgstr "Google+ Import Einstellungen"
+#: fromgplus.php:46 fromgplus.php:50
+msgid "Google+ Mirror"
+msgstr "Google+ Spiegel"

-#: fromgplus.php:36
+#: fromgplus.php:55
 msgid "Enable Google+ Import"
 msgstr "Aktiviere Google+ Import"

-#: fromgplus.php:39
+#: fromgplus.php:58
 msgid "Google Account ID"
 msgstr "Google Account ID"

-#: fromgplus.php:44
-msgid "Submit"
-msgstr "Senden"
+#: fromgplus.php:61
+msgid "Add keywords to post"
+msgstr "Schlüsselwörter zum Beitrag hinzufügen"

-#: fromgplus.php:59
+#: fromgplus.php:66 fromgplus.php:95
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: fromgplus.php:87
 msgid "Google+ Import Settings saved."
 msgstr "Google+ Import Einstellungen gespeichert."
+
+#: fromgplus.php:96
+msgid "Key"
+msgstr "Schlüssel"
+
+#: fromgplus.php:103
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
--- a/fromgplus/lang/de/strings.php
+++ b/fromgplus/lang/de/strings.php
@ -5,8 +5,11 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Google+ Import Settings"] = "Google+ Import Einstellungen";
+$a->strings["Google+ Mirror"] = "Google+ Spiegel";
 $a->strings["Enable Google+ Import"] = "Aktiviere Google+ Import";
 $a->strings["Google Account ID"] = "Google Account ID";
-$a->strings["Submit"] = "Senden";
+$a->strings["Add keywords to post"] = "Schlüsselwörter zum Beitrag hinzufügen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
 $a->strings["Google+ Import Settings saved."] = "Google+ Import Einstellungen gespeichert.";
+$a->strings["Key"] = "Schlüssel";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
--- a/fromgplus/lang/es/messages.po
+++ b/fromgplus/lang/es/messages.po
@ -0,0 +1,53 @@
+# ADDON fromgplus
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromgplus addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-12 16:52+0000\n"
+"PO-Revision-Date: 2016-11-16 16:34+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromgplus.php:46 fromgplus.php:50
+msgid "Google+ Mirror"
+msgstr "Reflector de Google+"
+
+#: fromgplus.php:55
+msgid "Enable Google+ Import"
+msgstr "Habilitar importación de Google+"
+
+#: fromgplus.php:58
+msgid "Google Account ID"
+msgstr "ID de cuenta de Google"
+
+#: fromgplus.php:61
+msgid "Add keywords to post"
+msgstr "Añadir palabras clave a la entrada"
+
+#: fromgplus.php:66 fromgplus.php:95
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
+
+#: fromgplus.php:87
+msgid "Google+ Import Settings saved."
+msgstr "Ajustes de importación de Google+ guardados."
+
+#: fromgplus.php:96
+msgid "Key"
+msgstr "Clave"
+
+#: fromgplus.php:103
+msgid "Settings updated."
+msgstr "Ajustes actualizados."
--- a/fromgplus/lang/es/strings.php
+++ b/fromgplus/lang/es/strings.php
@ -1,7 +1,15 @@
-<?php
-
-$a->strings["Google+ Import Settings"] = "Configuración de la importación de Google+";
-$a->strings["Enable Google+ Import"] = "Habilitar la importación de Google+";
-$a->strings["Google Account ID"] = "ID de la cuenta de Google";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Google+ Import Settings saved."] = "Configuración de la importación de Google+ guardada.";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Google+ Mirror"] = "Reflector de Google+";
+$a->strings["Enable Google+ Import"] = "Habilitar importación de Google+";
+$a->strings["Google Account ID"] = "ID de cuenta de Google";
+$a->strings["Add keywords to post"] = "Añadir palabras clave a la entrada";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Google+ Import Settings saved."] = "Ajustes de importación de Google+ guardados.";
+$a->strings["Key"] = "Clave";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
--- a/fromgplus/lang/it/messages.po
+++ b/fromgplus/lang/it/messages.po
@ -4,13 +4,14 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2017
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2015-08-31 10:12+0000\n"
+"POT-Creation-Date: 2016-11-12 16:52+0000\n"
+"PO-Revision-Date: 2017-01-18 10:38+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
@ -19,22 +20,34 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: fromgplus.php:33
-msgid "Google+ Import Settings"
-msgstr "Impostazioni Importa Google+"
+#: fromgplus.php:46 fromgplus.php:50
+msgid "Google+ Mirror"
+msgstr "Mirror Goggle+"

-#: fromgplus.php:36
+#: fromgplus.php:55
 msgid "Enable Google+ Import"
 msgstr "Abilita Importa da Google+"

-#: fromgplus.php:39
+#: fromgplus.php:58
 msgid "Google Account ID"
 msgstr "ID Google Account"

-#: fromgplus.php:44
-msgid "Submit"
-msgstr "Invia"
+#: fromgplus.php:61
+msgid "Add keywords to post"
+msgstr "Aggiungi parole chiave ai post"

-#: fromgplus.php:59
+#: fromgplus.php:66 fromgplus.php:95
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: fromgplus.php:87
 msgid "Google+ Import Settings saved."
 msgstr "Impostazioni Importa Google+ salvate"
+
+#: fromgplus.php:96
+msgid "Key"
+msgstr "Chiave"
+
+#: fromgplus.php:103
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
--- a/fromgplus/lang/it/strings.php
+++ b/fromgplus/lang/it/strings.php
@ -5,8 +5,11 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Google+ Import Settings"] = "Impostazioni Importa Google+";
+$a->strings["Google+ Mirror"] = "Mirror Goggle+";
 $a->strings["Enable Google+ Import"] = "Abilita Importa da Google+";
 $a->strings["Google Account ID"] = "ID Google Account";
-$a->strings["Submit"] = "Invia";
+$a->strings["Add keywords to post"] = "Aggiungi parole chiave ai post";
+$a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["Google+ Import Settings saved."] = "Impostazioni Importa Google+ salvate";
+$a->strings["Key"] = "Chiave";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
--- a/geonames/lang/es/messages.po
+++ b/geonames/lang/es/messages.po
@ -0,0 +1,36 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:35+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Ajustes de geonombres actualizados."
+
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr "Ajustes de Geonombres"
+
+#: geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Habilitar Plugin de Geonombres"
+
+#: geonames.php:187
+msgid "Submit"
+msgstr "Enviar"
--- a/geonames/lang/es/strings.php
+++ b/geonames/lang/es/strings.php
@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Geonames settings updated."] = "Configuración de Geonames actualizada.";
-$a->strings["Geonames Settings"] = "Configuración de Geonames";
-$a->strings["Enable Geonames Plugin"] = "Activar el complemento de nombres geográficos Geonames";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Geonames settings updated."] = "Ajustes de geonombres actualizados.";
+$a->strings["Geonames Settings"] = "Ajustes de Geonombres";
+$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonombres";
+$a->strings["Submit"] = "Enviar";
--- a/gnot/lang/es/messages.po
+++ b/gnot/lang/es/messages.po
@ -0,0 +1,47 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:38+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Ajustes de Gnot actualizados."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Ajustes de Gnot"
+
+#: gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema."
+
+#: gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "¿Habilitar este plugin/addon?"
+
+#: gnot.php:88
+msgid "Submit"
+msgstr "Enviar"
+
+#: gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica:Notify] Comentar en conversación #%d"
--- a/gnot/lang/es/strings.php
+++ b/gnot/lang/es/strings.php
@ -1,8 +1,13 @@
-<?php
-
-$a->strings["Gnot settings updated."] = "Configuración de Gnot actualizada.";
-$a->strings["Gnot Settings"] = "Configuración de Gnot";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permitir el enhebrado en las notificaciones de comentarios de correo en Gmail y hacer anónima la línea de \"Asunto\".";
-$a->strings["Enable this plugin/addon?"] = "¿Activar este módulo/extensión?";
-$a->strings["Submit"] = "Envíar";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificación] Comentario en la conversación de #%d";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Gnot settings updated."] = "Ajustes de Gnot actualizados.";
+$a->strings["Gnot Settings"] = "Ajustes de Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema.";
+$a->strings["Enable this plugin/addon?"] = "¿Habilitar este plugin/addon?";
+$a->strings["Submit"] = "Enviar";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentar en conversación #%d";
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@ -434,7 +434,7 @@ function gpluspost_init() {
 		foreach ($items AS $item)
 			gpluspost_feeditem($item, $uid);
 	} else {
-		$items = q("SELECT `id` FROM `item` FORCE INDEX (`received`) WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
+		$items = q("SELECT `id` FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
 		foreach ($items AS $item)
 			gpluspost_feeditem($item["id"], $uid);
 	}
--- a/gpluspost/lang/C/messages.po
+++ b/gpluspost/lang/C/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:44+0200\n"
+"POT-Creation-Date: 2016-11-12 16:50+0000\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"
@ -17,50 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: gpluspost.php:38
+#: gpluspost.php:39
 msgid "Post to Google+"
 msgstr ""

-#: gpluspost.php:93
+#: gpluspost.php:94
 msgid "Enable Google+ Post Plugin"
 msgstr ""

-#: gpluspost.php:108
+#: gpluspost.php:109
 msgid "Google+ username"
 msgstr ""

-#: gpluspost.php:113
+#: gpluspost.php:114
 msgid "Google+ password"
 msgstr ""

-#: gpluspost.php:118
+#: gpluspost.php:119
 msgid "Google+ page number"
 msgstr ""

-#: gpluspost.php:124
+#: gpluspost.php:125
 msgid "Post to Google+ by default"
 msgstr ""

-#: gpluspost.php:129
+#: gpluspost.php:130
 msgid "Do not prevent posting loops"
 msgstr ""

-#: gpluspost.php:135
+#: gpluspost.php:136
 msgid "Skip messages without links"
 msgstr ""

-#: gpluspost.php:142
+#: gpluspost.php:143
 msgid "Mirror all public posts"
 msgstr ""

-#: gpluspost.php:146
+#: gpluspost.php:147
 msgid "Mirror Google Account ID"
 msgstr ""

-#: gpluspost.php:153
+#: gpluspost.php:154
 msgid "Save Settings"
 msgstr ""

-#: gpluspost.php:308
+#: gpluspost.php:310
 msgid "Google+ post failed. Queued for retry."
 msgstr ""
--- a/gpluspost/lang/es/messages.po
+++ b/gpluspost/lang/es/messages.po
@ -0,0 +1,68 @@
+# ADDON gpluspost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gpluspost addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-12 16:50+0000\n"
+"PO-Revision-Date: 2016-11-16 16:43+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gpluspost.php:39
+msgid "Post to Google+"
+msgstr "Publicar en Google+"
+
+#: gpluspost.php:94
+msgid "Enable Google+ Post Plugin"
+msgstr "Habilitar el plugin de publicación de Google+"
+
+#: gpluspost.php:109
+msgid "Google+ username"
+msgstr "Nombre de usuario de Google+"
+
+#: gpluspost.php:114
+msgid "Google+ password"
+msgstr "Contraseña de Google+"
+
+#: gpluspost.php:119
+msgid "Google+ page number"
+msgstr "Número de página de Google+"
+
+#: gpluspost.php:125
+msgid "Post to Google+ by default"
+msgstr "Publicar en Google+ por defecto"
+
+#: gpluspost.php:130
+msgid "Do not prevent posting loops"
+msgstr "No impedir los bucles de publicación"
+
+#: gpluspost.php:136
+msgid "Skip messages without links"
+msgstr "Saltar los mensajes sin enlaces"
+
+#: gpluspost.php:143
+msgid "Mirror all public posts"
+msgstr "Reflejar todas las entradas públicas"
+
+#: gpluspost.php:147
+msgid "Mirror Google Account ID"
+msgstr "Reflecar la ID de Cuenta de Google"
+
+#: gpluspost.php:154
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: gpluspost.php:310
+msgid "Google+ post failed. Queued for retry."
+msgstr "La publicación en Google+ falló. En cola para reintentarlo."
--- a/gpluspost/lang/es/strings.php
+++ b/gpluspost/lang/es/strings.php
@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Google+"] = "Publicar en Google+";
+$a->strings["Enable Google+ Post Plugin"] = "Habilitar el plugin de publicación de Google+";
+$a->strings["Google+ username"] = "Nombre de usuario de Google+";
+$a->strings["Google+ password"] = "Contraseña de Google+";
+$a->strings["Google+ page number"] = "Número de página de Google+";
+$a->strings["Post to Google+ by default"] = "Publicar en Google+ por defecto";
+$a->strings["Do not prevent posting loops"] = "No impedir los bucles de publicación";
+$a->strings["Skip messages without links"] = "Saltar los mensajes sin enlaces";
+$a->strings["Mirror all public posts"] = "Reflejar todas las entradas públicas";
+$a->strings["Mirror Google Account ID"] = "Reflecar la ID de Cuenta de Google";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Google+ post failed. Queued for retry."] = "La publicación en Google+ falló. En cola para reintentarlo.";
--- a/gpluspost/lang/it/messages.po
+++ b/gpluspost/lang/it/messages.po
@ -9,60 +9,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:44+0200\n"
+"POT-Creation-Date: 2016-11-12 16:50+0000\n"
 "PO-Revision-Date: 2014-09-10 12:14+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: gpluspost.php:38
+#: gpluspost.php:39
 msgid "Post to Google+"
 msgstr "Invia a Google+"

-#: gpluspost.php:93
+#: gpluspost.php:94
 msgid "Enable Google+ Post Plugin"
 msgstr "Abilita il plugin di invio a Google+"

-#: gpluspost.php:108
+#: gpluspost.php:109
 msgid "Google+ username"
 msgstr "Nome utente Google+"

-#: gpluspost.php:113
+#: gpluspost.php:114
 msgid "Google+ password"
 msgstr "Password Google+"

-#: gpluspost.php:118
+#: gpluspost.php:119
 msgid "Google+ page number"
 msgstr "Numero pagina Google+"

-#: gpluspost.php:124
+#: gpluspost.php:125
 msgid "Post to Google+ by default"
 msgstr "Invia sempre a Google+"

-#: gpluspost.php:129
+#: gpluspost.php:130
 msgid "Do not prevent posting loops"
 msgstr "Non prevenire i loop di invio"

-#: gpluspost.php:135
+#: gpluspost.php:136
 msgid "Skip messages without links"
 msgstr "Salta i messaggi senza collegamenti"

-#: gpluspost.php:142
+#: gpluspost.php:143
 msgid "Mirror all public posts"
 msgstr "Ricopia tutti i post pubblici"

-#: gpluspost.php:146
+#: gpluspost.php:147
 msgid "Mirror Google Account ID"
 msgstr "Ricopia l'ID Google Account"

-#: gpluspost.php:153
+#: gpluspost.php:154
 msgid "Save Settings"
 msgstr "Salva Impostazioni"

-#: gpluspost.php:308
+#: gpluspost.php:310
 msgid "Google+ post failed. Queued for retry."
 msgstr "Invio a Google+ fallito. In attesa di riprovare."
--- a/gravatar/lang/es/messages.po
+++ b/gravatar/lang/es/messages.po
@ -0,0 +1,75 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:51+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gravatar.php:71
+msgid "generic profile image"
+msgstr "imagen de perfir genético"
+
+#: gravatar.php:72
+msgid "random geometric pattern"
+msgstr "patrón geométrico aleatorio"
+
+#: gravatar.php:73
+msgid "monster face"
+msgstr "cara de monstruo"
+
+#: gravatar.php:74
+msgid "computer generated face"
+msgstr "cara generada por ordenador"
+
+#: gravatar.php:75
+msgid "retro arcade style face"
+msgstr "cara estilo arcade clásico"
+
+#: gravatar.php:89
+msgid "Information"
+msgstr "información"
+
+#: gravatar.php:89
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "El addon Libravatar está instalado también. Por favor deshabilite el addon de Libravatar o este addon de Gravatar.<br>El addon de Libravatar retrocederá a Gravatar si no se encuentra nada en Libravatar."
+
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Enviar"
+
+#: gravatar.php:96
+msgid "Default avatar image"
+msgstr "Imagen de avatar por defecto"
+
+#: gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Seleccionar la imagen de avatar por defecto si no se encuentra ninguna en Gravatar. Vea README"
+
+#: gravatar.php:97
+msgid "Rating of images"
+msgstr "Clasificación de imágenes"
+
+#: gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Seleccionar la apropiada clasificación de avatar para su página. Vea README"
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Ajustes de Gravatar actualizados."
--- a/gravatar/lang/es/strings.php
+++ b/gravatar/lang/es/strings.php
@ -1,15 +1,20 @@
-<?php
-
-$a->strings["generic profile image"] = "imagen genérica del perfil";
-$a->strings["random geometric pattern"] = "patrón geométrico aleatorio";
-$a->strings["monster face"] = "monstruosa";
-$a->strings["computer generated face"] = "generada por ordenador";
-$a->strings["retro arcade style face"] = "estilo retro arcade";
-$a->strings["Information"] = "Información";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El complemento Libravatar también está instalado. Por favor desactiva este complemento o el complemento de Gravatar.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar.";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Default avatar image"] = "Imagen del avatar por defecto";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecionar la imagen del avatar por defecto si no se ha encontrado ninguna en Gravatar. Mira el README";
-$a->strings["Rating of images"] = "Valoración de las imágenes";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecciona el avatar de clasificación apropiado para tu sitio. Ver README";
-$a->strings["Gravatar settings updated."] = "Configuración de Gravatar actualizada.";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["generic profile image"] = "imagen de perfir genético";
+$a->strings["random geometric pattern"] = "patrón geométrico aleatorio";
+$a->strings["monster face"] = "cara de monstruo";
+$a->strings["computer generated face"] = "cara generada por ordenador";
+$a->strings["retro arcade style face"] = "cara estilo arcade clásico";
+$a->strings["Information"] = "información";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El addon Libravatar está instalado también. Por favor deshabilite el addon de Libravatar o este addon de Gravatar.<br>El addon de Libravatar retrocederá a Gravatar si no se encuentra nada en Libravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Imagen de avatar por defecto";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Seleccionar la imagen de avatar por defecto si no se encuentra ninguna en Gravatar. Vea README";
+$a->strings["Rating of images"] = "Clasificación de imágenes";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Seleccionar la apropiada clasificación de avatar para su página. Vea README";
+$a->strings["Gravatar settings updated."] = "Ajustes de Gravatar actualizados.";
--- a/group_text/lang/es/messages.po
+++ b/group_text/lang/es/messages.po
@ -0,0 +1,36 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:53+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Ajustes de Grupo de Texto actualizados"
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Grupo de Texto"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\""
+
+#: group_text.php:84
+msgid "Submit"
+msgstr "Enviar"
--- a/group_text/lang/es/strings.php
+++ b/group_text/lang/es/strings.php
@ -1,5 +1,11 @@
-<?php
-
-$a->strings["Group Text"] = "Texto agrupado";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Usar selector de grupos solo texto (sin imágenes) en el menú \"editar grupo\"";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Group Text settings updated."] = "Ajustes de Grupo de Texto actualizados";
+$a->strings["Group Text"] = "Grupo de Texto";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\"";
+$a->strings["Submit"] = "Enviar";
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@ -48,7 +48,7 @@ function ifttt_settings(&$a,&$s) {
        $s .= '<div id="ifttt-configuration-wrapper">';
 	$s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with <a href='https://ifttt.com/maker'>Maker</a> (In the form 'if Facebook then Maker') with the following parameters:").'</p>';
 	$s .= '<h4>URL</h4>';
-	$s .= '<p>'.$a->get_baseurl()."/ifttt/".'</p>';
+	$s .= '<p>' . $a->get_baseurl() . '/ifttt/' . $a->user['nickname'] . '</p>';
 	$s .= '<h4>Method</h4>';
 	$s .= '<p>POST</p>';
 	$s .= '<h4>Content Type</h4>';
@ -155,8 +155,11 @@ function ifttt_message($uid, $item) {
 	//$_REQUEST["date"] = $item["date"];
 	//$_REQUEST["uri"] = $item["url"];

-	if (strstr($item["url"], "facebook.com"))
+	if (strstr($item["url"], "facebook.com")) {
+		$hash = hash("ripemd128", item["url"]);
 		$_REQUEST["extid"] = NETWORK_FACEBOOK;
+		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_FACEBOOK.":".$hash);
+	}

 	if ($item["type"] == "link") {
 		$data = query_page_info($item["link"]);
--- a/ijpost/lang/es/messages.po
+++ b/ijpost/lang/es/messages.po
@ -0,0 +1,48 @@
+# ADDON ijpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ijpost addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:55+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Publicar en Insanejournal"
+
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Ajustes de Entrada de InsaneJournal"
+
+#: ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Habilitar el Plugin de Entrada InsaneJournal"
+
+#: ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "Nombre de usuario InsaneJournal"
+
+#: ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "Contraseña de InsaneJournal"
+
+#: ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Publicar en InsaneJournal por defecto"
+
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Enviar"
--- a/ijpost/lang/es/strings.php
+++ b/ijpost/lang/es/strings.php
@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
-$a->strings["InsaneJournal Post Settings"] = "Configuración de publicación en Insanejournal";
-$a->strings["Enable InsaneJournal Post Plugin"] = "Activar el módulo de publicación en Insanejournal";
-$a->strings["InsaneJournal username"] = "Nombre de usuario de Insanejournal";
-$a->strings["InsaneJournal password"] = "Contraseña de Insanejournal";
-$a->strings["Post to InsaneJournal by default"] = "Publicar en Insanejournal por defecto";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Ajustes de Entrada de InsaneJournal";
+$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar el Plugin de Entrada InsaneJournal";
+$a->strings["InsaneJournal username"] = "Nombre de usuario InsaneJournal";
+$a->strings["InsaneJournal password"] = "Contraseña de InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Publicar en InsaneJournal por defecto";
+$a->strings["Submit"] = "Enviar";
--- a/ijpost/lang/it/messages.po
+++ b/ijpost/lang/it/messages.po
@ -4,15 +4,15 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-10-15 08:38+0000\n"
+"PO-Revision-Date: 2015-08-31 10:15+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -25,7 +25,7 @@ msgstr "Invia a InsaneJournal"

 #: ijpost.php:70
 msgid "InsaneJournal Post Settings"
-msgstr ""
+msgstr "Impostazioni post InsaneJournal"

 #: ijpost.php:72
 msgid "Enable InsaneJournal Post Plugin"
@ -45,4 +45,4 @@ msgstr "Invia sempre a InsaneJournal"

 #: ijpost.php:93
 msgid "Submit"
-msgstr ""
+msgstr "Invia"
--- a/ijpost/lang/it/strings.php
+++ b/ijpost/lang/it/strings.php
@ -6,9 +6,9 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal";
-$a->strings["InsaneJournal Post Settings"] = "";
+$a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal";
 $a->strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin di invio a InsaneJournal";
 $a->strings["InsaneJournal username"] = "Nome utente InsaneJournal";
 $a->strings["InsaneJournal password"] = "Password InsaneJournal";
 $a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal";
-$a->strings["Submit"] = "";
+$a->strings["Submit"] = "Invia";
--- a/impressum/lang/es/messages.po
+++ b/impressum/lang/es/messages.po
@ -0,0 +1,89 @@
+# ADDON impressum
+# Copyright (C)
+# This file is distributed under the same license as the Friendica impressum addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 13:13+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: impressum.php:37
+msgid "Impressum"
+msgstr "Impressum"
+
+#: impressum.php:50 impressum.php:52 impressum.php:84
+msgid "Site Owner"
+msgstr "Propietario de la página"
+
+#: impressum.php:50 impressum.php:88
+msgid "Email Address"
+msgstr "Dirección de Email"
+
+#: impressum.php:55 impressum.php:86
+msgid "Postal Address"
+msgstr "Dirección postal"
+
+#: impressum.php:61
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "¡El addon impressum necesita ser configurado!<br />Por favor añada al menos <tt>propietario</tt> disponible en su archivo de configuración. Para otros valores por favor dirígase al archivo README del addon."
+
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Ajustes actualizados"
+
+#: impressum.php:83
+msgid "Submit"
+msgstr "Enviar"
+
+#: impressum.php:84
+msgid "The page operators name."
+msgstr "El nombre de los operadores de página"
+
+#: impressum.php:85
+msgid "Site Owners Profile"
+msgstr "Perfil del Propietario de la Página"
+
+#: impressum.php:85
+msgid "Profile address of the operator."
+msgstr "Dirección del perfil del operador."
+
+#: impressum.php:86
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr "Cómo contactar con el operador via correo ordinario. Puede usar BBCode aquí."
+
+#: impressum.php:87
+msgid "Notes"
+msgstr "Notas"
+
+#: impressum.php:87
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can"
+" use BBCode here."
+msgstr "Notas adicionales que se muestran bajo la información de contacto. Puede usar BBCode aquí."
+
+#: impressum.php:88
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Cómo contactar con el operador via email. (se mostrará ofuscado)"
+
+#: impressum.php:89
+msgid "Footer note"
+msgstr "Nota de pie de página"
+
+#: impressum.php:89
+msgid "Text for the footer. You can use BBCode here."
+msgstr "Texto para el pie de página. Puede usar BBCode aquí"
--- a/impressum/lang/es/strings.php
+++ b/impressum/lang/es/strings.php
@ -1,18 +1,23 @@
-<?php
-
-$a->strings["Impressum"] = "Términos y Política del sitio";
-$a->strings["Site Owner"] = "Propietario";
-$a->strings["Email Address"] = "Dirección de correo";
-$a->strings["Postal Address"] = "Dirección";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Impressum necesita ser configurado.<br />Por favor añade al menos la variable <tt>propietario<tt> a tu archivo de configuración. Para otras variables lee el archivo README.";
-$a->strings["Settings updated."] = "Configuración actualizada.";
-$a->strings["Submit"] = "Envíar";
-$a->strings["The page operators name."] = "Nombre del operador de la página.";
-$a->strings["Site Owners Profile"] = "Perfil del propietario del sitio";
-$a->strings["Profile address of the operator."] = "Dirección del perfil del operador.";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cómo contactar con el operador vía correo postal. BBCode permitido.";
-$a->strings["Notes"] = "Notas";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notas adicionales que se mostrarán bajo la información del contacto. BBCode permitido.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Cómo contactar con el operador vía email (aparecerá oculto)";
-$a->strings["Footer note"] = "Nota a pie";
-$a->strings["Text for the footer. You can use BBCode here."] = "Texto para el Pie de página. BBCode permitido.";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Propietario de la página";
+$a->strings["Email Address"] = "Dirección de Email";
+$a->strings["Postal Address"] = "Dirección postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "¡El addon impressum necesita ser configurado!<br />Por favor añada al menos <tt>propietario</tt> disponible en su archivo de configuración. Para otros valores por favor dirígase al archivo README del addon.";
+$a->strings["Settings updated."] = "Ajustes actualizados";
+$a->strings["Submit"] = "Enviar";
+$a->strings["The page operators name."] = "El nombre de los operadores de página";
+$a->strings["Site Owners Profile"] = "Perfil del Propietario de la Página";
+$a->strings["Profile address of the operator."] = "Dirección del perfil del operador.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cómo contactar con el operador via correo ordinario. Puede usar BBCode aquí.";
+$a->strings["Notes"] = "Notas";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notas adicionales que se muestran bajo la información de contacto. Puede usar BBCode aquí.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Cómo contactar con el operador via email. (se mostrará ofuscado)";
+$a->strings["Footer note"] = "Nota de pie de página";
+$a->strings["Text for the footer. You can use BBCode here."] = "Texto para el pie de página. Puede usar BBCode aquí";
--- a/infiniteimprobabilitydrive/lang/es/messages.po
+++ b/infiniteimprobabilitydrive/lang/es/messages.po
@ -0,0 +1,24 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-11-17 13:15+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Drive de improbabilidad infinita"
--- a/infiniteimprobabilitydrive/lang/es/strings.php
+++ b/infiniteimprobabilitydrive/lang/es/strings.php
@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Infinite Improbability Drive"] = "Unidad de improbabilidad infinita";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Infinite Improbability Drive"] = "Drive de improbabilidad infinita";
--- a/infiniteimprobabilitydrive/lang/it/messages.po
+++ b/infiniteimprobabilitydrive/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: 2014-09-10 12:23+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/irc/lang/es/messages.po
+++ b/irc/lang/es/messages.po
@ -0,0 +1,67 @@
+# ADDON irc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica irc addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2016-11-17 18:51+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Ajustes de IRC"
+
+#: irc.php:38
+msgid ""
+"Here you can change the system wide settings for the channels to "
+"automatically join and access via the side bar. Note the changes you do "
+"here, only effect the channel selection if you are logged in."
+msgstr "Aquí puede cambiar los ajustes de todo el sistema de los canales para unirse y acceder automáticamente mediante la barra lateral. Note que los cambios que hace aquí sólo afectan a la selección del canal si usted está conectado."
+
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
+
+#: irc.php:40 irc.php:137
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "Canal(s) para autocorregir (separados por comas)"
+
+#: irc.php:40 irc.php:137
+msgid ""
+"List of channels that shall automatically connected to when the app is "
+"launched."
+msgstr "Lista de canales que se conectarán automáticamente cuando la aplicación sea lanzada."
+
+#: irc.php:41 irc.php:138
+msgid "Popular Channels (comma separated)"
+msgstr "Canales Populares (separados por comas)"
+
+#: irc.php:41 irc.php:138
+msgid ""
+"List of popular channels, will be displayed at the side and hotlinked for "
+"easy joining."
+msgstr "Lista de canales populares, se mostrará al lado y tendrá un enlace para unirse fácilmente."
+
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "Ajustes de IRC guardados."
+
+#: irc.php:62
+msgid "IRC Chatroom"
+msgstr "Sala de chat de IRC"
+
+#: irc.php:90
+msgid "Popular Channels"
+msgstr "Canales Populares"
--- a/irc/lang/es/strings.php
+++ b/irc/lang/es/strings.php
@ -1,9 +1,17 @@
-<?php
-
-$a->strings["IRC Settings"] = "Configuración IRC";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "Conectar automáticamente a (canales separados por coma)";
-$a->strings["Popular Channels (comma separated)"] = "Canales populares (separados por coma)";
-$a->strings["Submit"] = "Envíar";
-$a->strings["IRC settings saved."] = "Configuración de IRC guardada.";
-$a->strings["IRC Chatroom"] = "Sala de Chat IRC";
-$a->strings["Popular Channels"] = "Canales populares";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["IRC Settings"] = "Ajustes de IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Aquí puede cambiar los ajustes de todo el sistema de los canales para unirse y acceder automáticamente mediante la barra lateral. Note que los cambios que hace aquí sólo afectan a la selección del canal si usted está conectado.";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(s) para autocorregir (separados por comas)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista de canales que se conectarán automáticamente cuando la aplicación sea lanzada.";
+$a->strings["Popular Channels (comma separated)"] = "Canales Populares (separados por comas)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista de canales populares, se mostrará al lado y tendrá un enlace para unirse fácilmente.";
+$a->strings["IRC settings saved."] = "Ajustes de IRC guardados.";
+$a->strings["IRC Chatroom"] = "Sala de chat de IRC";
+$a->strings["Popular Channels"] = "Canales Populares";
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@ -550,7 +550,8 @@ function jappixmini_cron(&$a, $d) {
 		$uid = $row["uid"];

 		// for each user, go through list of contacts
-		$contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`)))", intval($uid));
+		$contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`))) AND `network` = '%s'",
+			intval($uid), dbesc(NETWORK_DFRN));
 		foreach ($contacts as $contact_row) {
 			$request = $contact_row["request"];
 			if (!$request) continue;
--- a/jappixmini/lang/es/messages.po
+++ b/jappixmini/lang/es/messages.po
@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 18:56+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Ajustes del addon de Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activar addon"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>No</em> insertar el Widget de chat de Jappixmini en la interfaz web"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Usuario de Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Servidor de Jabber"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Servidor de Jabber BOSH"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Contraseña de Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Encriptar la contraseña de Jabber con la contraseña de Friendica (recomendado)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Contraseña de Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Aprobar solicitud de suscripción de los contactos de Friendica automáticamente"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Siscribirse a los contactos de Friendica automáticamente"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Eliminar la lista interna de direcciones de contactos de jabber"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Enviar"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Añadir contacto"
--- a/jappixmini/lang/es/strings.php
+++ b/jappixmini/lang/es/strings.php
@ -1,16 +1,21 @@
-<?php
-
-$a->strings["Jappix Mini addon settings"] = "Ajustes de complemento Jappix Mini";
-$a->strings["Activate addon"] = "Activar complemento";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>No</em> insertar la aplicación de chat Jappixmini en la interfaz web";
-$a->strings["Jabber username"] = "Nombre de usuario de Jabber";
-$a->strings["Jabber server"] = "Servidor de Jabber";
-$a->strings["Jabber BOSH host"] = "Anfitrión BOSH de Jabber";
-$a->strings["Jabber password"] = "Contraseña de Jabber";
-$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar contraseña de Jabber con la contraseña de Friendica (recomendado)";
-$a->strings["Friendica password"] = "Contraseña de Friendica";
-$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar peticiones de suscripción de contactos de Friendica automáticamente";
-$a->strings["Subscribe to Friendica contacts automatically"] = "Suscribirse a contactos de Friendica automáticamente";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "Purgar los contactos de la lista interna de direcciones de Jabber";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Add contact"] = "Añadir contacto";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Ajustes del addon de Jappix Mini";
+$a->strings["Activate addon"] = "Activar addon";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>No</em> insertar el Widget de chat de Jappixmini en la interfaz web";
+$a->strings["Jabber username"] = "Usuario de Jabber";
+$a->strings["Jabber server"] = "Servidor de Jabber";
+$a->strings["Jabber BOSH host"] = "Servidor de Jabber BOSH";
+$a->strings["Jabber password"] = "Contraseña de Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar la contraseña de Jabber con la contraseña de Friendica (recomendado)";
+$a->strings["Friendica password"] = "Contraseña de Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar solicitud de suscripción de los contactos de Friendica automáticamente";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Siscribirse a los contactos de Friendica automáticamente";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Eliminar la lista interna de direcciones de contactos de jabber";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Add contact"] = "Añadir contacto";
--- a/js_upload/lang/es/messages.po
+++ b/js_upload/lang/es/messages.po
@ -0,0 +1,56 @@
+# ADDON js_upload
+# Copyright (C)
+# This file is distributed under the same license as the Friendica js_upload addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 18:59+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Subir un archivo"
+
+#: js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Soltar archivos aquí para subir"
+
+#: js_upload.php:45
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js_upload.php:46
+msgid "Failed"
+msgstr "Fallido"
+
+#: js_upload.php:303
+msgid "No files were uploaded."
+msgstr "No se subió ningún archivo."
+
+#: js_upload.php:309
+msgid "Uploaded file is empty"
+msgstr "El archivo subido está vacío"
+
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "La imagen excede el tamaño de"
+
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "El archivo tiene una extensión inválida, debería ser una de"
+
+#: js_upload.php:343
+msgid "Upload was cancelled, or server error encountered"
+msgstr "La subida fue cancelada, o el servidor tuvo un error"
--- a/js_upload/lang/es/strings.php
+++ b/js_upload/lang/es/strings.php
@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Upload a file"] = "Subir un archivo";
-$a->strings["Drop files here to upload"] = "Arrastra los archivos aquí para subirlos";
-$a->strings["Cancel"] = "Cancelar";
-$a->strings["Failed"] = "Falló";
-$a->strings["No files were uploaded."] = "No se han subido archivos aún.";
-$a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
-$a->strings["Image exceeds size limit of "] = "La imagen supera tamaño límite de ";
-$a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de ";
-$a->strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Upload a file"] = "Subir un archivo";
+$a->strings["Drop files here to upload"] = "Soltar archivos aquí para subir";
+$a->strings["Cancel"] = "Cancelar";
+$a->strings["Failed"] = "Fallido";
+$a->strings["No files were uploaded."] = "No se subió ningún archivo.";
+$a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
+$a->strings["Image exceeds size limit of "] = "La imagen excede el tamaño de";
+$a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión inválida, debería ser una de";
+$a->strings["Upload was cancelled, or server error encountered"] = "La subida fue cancelada, o el servidor tuvo un error";
--- a/js_upload/lang/it/messages.po
+++ b/js_upload/lang/it/messages.po
@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2014-09-10 12:26+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/krynn/lang/es/messages.po
+++ b/krynn/lang/es/messages.po
@ -0,0 +1,32 @@
+# ADDON krynn
+# Copyright (C)
+# This file is distributed under the same license as the Friendica krynn addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:42+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: krynn.php:150
+msgid "Krynn Settings"
+msgstr "Ajustes de Krynn"
+
+#: krynn.php:152
+msgid "Enable Krynn Plugin"
+msgstr "Habilitar Plugin de Krynn"
+
+#: krynn.php:158
+msgid "Submit"
+msgstr "Enviar"
--- a/krynn/lang/es/strings.php
+++ b/krynn/lang/es/strings.php
@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Krynn Settings"] = "Configuración de Krynn";
-$a->strings["Enable Krynn Plugin"] = "Activar el módulo de planetas Krynn";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Krynn Settings"] = "Ajustes de Krynn";
+$a->strings["Enable Krynn Plugin"] = "Habilitar Plugin de Krynn";
+$a->strings["Submit"] = "Enviar";
--- a/langfilter/lang/es/messages.po
+++ b/langfilter/lang/es/messages.po
@ -0,0 +1,70 @@
+# ADDON langfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica langfilter addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-22 15:18+0200\n"
+"PO-Revision-Date: 2016-11-19 11:47+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: langfilter.php:44
+msgid "Language Filter"
+msgstr "Filtro de Idioma"
+
+#: langfilter.php:45
+msgid ""
+"This addon tries to identify the language of a postings. If it does not "
+"match any language spoken by you (see below) the posting will be collapsed. "
+"Remember detecting the language is not perfect, especially with short "
+"postings."
+msgstr "Este addon intenta identificar el idioma de las publicaciones. Si no encuentra ningún idioma hablado por usted (ver abajo) la entrada se colapsará. Recordar detectar el idioma no es perfecto, especialmente con entradas cortas."
+
+#: langfilter.php:46
+msgid "Use the language filter"
+msgstr "Usar el filtro de idioma"
+
+#: langfilter.php:47
+msgid "I speak"
+msgstr "Yo hablo"
+
+#: langfilter.php:47
+msgid ""
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\"."
+
+#: langfilter.php:48
+msgid "Minimum confidence in language detection"
+msgstr "Mínima confianza en la detección de idioma"
+
+#: langfilter.php:48
+msgid ""
+"Minimum confidence in language detection being correct, from 0 to 100. Posts"
+" will not be filtered when the confidence of language detection is below "
+"this percent value."
+msgstr "Mínima confianza en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje."
+
+#: langfilter.php:49
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
+
+#: langfilter.php:73
+msgid "Language Filter Settings saved."
+msgstr "Ajustes de Filtro de Idioma guardados."
+
+#: langfilter.php:123
+#, php-format
+msgid "unspoken language %s - Click to open/close"
+msgstr "Idioma sobreentendido %s - Click para abrir/cerrar"
--- a/langfilter/lang/es/strings.php
+++ b/langfilter/lang/es/strings.php
@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Language Filter"] = "Filtro de Idioma";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Este addon intenta identificar el idioma de las publicaciones. Si no encuentra ningún idioma hablado por usted (ver abajo) la entrada se colapsará. Recordar detectar el idioma no es perfecto, especialmente con entradas cortas.";
+$a->strings["Use the language filter"] = "Usar el filtro de idioma";
+$a->strings["I speak"] = "Yo hablo";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Mínima confianza en la detección de idioma";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Mínima confianza en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje.";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Language Filter Settings saved."] = "Ajustes de Filtro de Idioma guardados.";
+$a->strings["unspoken language %s - Click to open/close"] = "Idioma sobreentendido %s - Click para abrir/cerrar";
--- a/langfilter/lang/it/messages.po
+++ b/langfilter/lang/it/messages.po
@ -5,7 +5,7 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2015
-# Sandro Santilli <strk@keybit.net>, 2015
+# Sandro Santilli <strk@kbt.io>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
--- a/libertree/lang/es/messages.po
+++ b/libertree/lang/es/messages.po
@ -0,0 +1,48 @@
+# ADDON libertree
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libertree addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 20:15+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: libertree.php:36
+msgid "Post to libertree"
+msgstr "Publicar en Libertree"
+
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Ajustes de Publicación de Libertree"
+
+#: libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr "Habilitar Plugin de publicación de Libertree"
+
+#: libertree.php:74
+msgid "Libertree API token"
+msgstr "Símbolo de API de Libertree"
+
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr "URL de la página de Libertree"
+
+#: libertree.php:84
+msgid "Post to Libertree by default"
+msgstr "Publicar en Libertree por defecto"
+
+#: libertree.php:90
+msgid "Submit"
+msgstr "Enviar"
--- a/libertree/lang/es/strings.php
+++ b/libertree/lang/es/strings.php
@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to libertree"] = "Publicar en Libertree";
-$a->strings["libertree Post Settings"] = "Configuración de la publicación en Libertree";
-$a->strings["Enable Libertree Post Plugin"] = "Activar el módulo de publicación en Libertree";
-$a->strings["Libertree API token"] = "Ficha API de Libertree";
-$a->strings["Libertree site URL"] = "Dirección de Libertree";
-$a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to libertree"] = "Publicar en Libertree";
+$a->strings["libertree Post Settings"] = "Ajustes de Publicación de Libertree";
+$a->strings["Enable Libertree Post Plugin"] = "Habilitar Plugin de publicación de Libertree";
+$a->strings["Libertree API token"] = "Símbolo de API de Libertree";
+$a->strings["Libertree site URL"] = "URL de la página de Libertree";
+$a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto";
+$a->strings["Submit"] = "Enviar";
--- a/libravatar/lang/es/messages.po
+++ b/libravatar/lang/es/messages.po
@ -0,0 +1,84 @@
+# ADDON libravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libravatar addon package.
+# 
+# 
+# Translators:
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-12 15:10+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Podría NO instalar Libravatar con éxito.<br>Requiere PHP >= 5.3"
+
+#: libravatar.php:73
+msgid "generic profile image"
+msgstr "Imagen de perfil genérica"
+
+#: libravatar.php:74
+msgid "random geometric pattern"
+msgstr "Estampado geométrico aleatorio"
+
+#: libravatar.php:75
+msgid "monster face"
+msgstr "cara de monstruo"
+
+#: libravatar.php:76
+msgid "computer generated face"
+msgstr "Cara generada por ordenador"
+
+#: libravatar.php:77
+msgid "retro arcade style face"
+msgstr "Cara de estilo retro"
+
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Advertencia"
+
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Su versión PHP %s es inferior a la requerida PHP >= 5.3."
+
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Este complemento no es funcional en su servidor"
+
+#: libravatar.php:93
+msgid "Information"
+msgstr "Información"
+
+#: libravatar.php:93
+msgid ""
+"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
+"Libravatar addon will fall back to Gravatar if nothing was found at "
+"Libravatar."
+msgstr "El complemento Gravatar se ha instalado. Por favor desactive el complemento Gravatar. <br>El complemento Libravatar quedará por detrás de Gravatar si no se encuentra nada en Libravatar."
+
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Enviar"
+
+#: libravatar.php:100
+msgid "Default avatar image"
+msgstr "Imagen de avatar por defecto"
+
+#: libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr "Selecione el avatar por defecto si no se encuentra ninguno. Vea README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Ajustes de Libravatar actualizados"
--- a/libravatar/lang/es/strings.php
+++ b/libravatar/lang/es/strings.php
@ -1,17 +1,22 @@
-<?php
-
-$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar puede no haberse instalado correctamente.<br>Requiere PHP >=5.3";
-$a->strings["generic profile image"] = "imagen genérica del perfil";
-$a->strings["random geometric pattern"] = "patrón geométrico aleatorio";
-$a->strings["monster face"] = "monstruosa";
-$a->strings["computer generated face"] = "generada por ordenador";
-$a->strings["retro arcade style face"] = "estilo retro arcade";
-$a->strings["Warning"] = "Aviso";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Tu versión de PHP %s, menor que la requerida (PHP >=5.3).";
-$a->strings["This addon is not functional on your server."] = "Esta funcionalidad no está activa en tu servidor.";
-$a->strings["Information"] = "Información";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El complemento Gravatar está instalado. Por favor, desactiva dicho complemento.<br>El complemento Libravatar usará Gravatar si no encuentra nada en Libravatar.";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Default avatar image"] = "Imagen del avatar por defecto";
-$a->strings["Select default avatar image if none was found. See README"] = "Elige una imagen para tu avatar si no se encuentra ninguna (ver README)";
-$a->strings["Libravatar settings updated."] = "Configuración de Libravatar actualizada.";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Podría NO instalar Libravatar con éxito.<br>Requiere PHP >= 5.3";
+$a->strings["generic profile image"] = "Imagen de perfil genérica";
+$a->strings["random geometric pattern"] = "Estampado geométrico aleatorio";
+$a->strings["monster face"] = "cara de monstruo";
+$a->strings["computer generated face"] = "Cara generada por ordenador";
+$a->strings["retro arcade style face"] = "Cara de estilo retro";
+$a->strings["Warning"] = "Advertencia";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Su versión PHP %s es inferior a la requerida PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Este complemento no es funcional en su servidor";
+$a->strings["Information"] = "Información";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El complemento Gravatar se ha instalado. Por favor desactive el complemento Gravatar. <br>El complemento Libravatar quedará por detrás de Gravatar si no se encuentra nada en Libravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Imagen de avatar por defecto";
+$a->strings["Select default avatar image if none was found. See README"] = "Selecione el avatar por defecto si no se encuentra ninguno. Vea README";
+$a->strings["Libravatar settings updated."] = "Ajustes de Libravatar actualizados";
--- a/Show more
+++ b/Show more