From b3eb963a2bdff7735b32085f30c9a715d14482f0 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 12 Mar 2016 07:42:57 +0100 Subject: [PATCH 01/58] fromgplus: Add keywords to imported posts --- fromgplus/fromgplus.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index e0fdc705f..d21ece2b4 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -10,6 +10,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes require_once('mod/share.php'); +require_once('mod/parse_url.php'); function fromgplus_install() { register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); @@ -323,6 +324,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"])) + $pagedata["keywords"] = $data["keywords"]; + break; case "photo": From 1ffa5387c5dd61dc8352de898b4c8ea0c1f8a591 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 15 Sep 2016 09:52:30 +0000 Subject: [PATCH 02/58] Rendertime: Ignorelist for page where rendertime doesn't look good. --- rendertime/rendertime.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 548775a10..38b50a538 100755 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -26,7 +26,10 @@ function rendertime_page_end(&$a, &$o) { $duration = microtime(true)-$a->performance["start"]; - if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet) { + $ignored_modules = array("fbrowser"); + $ignored = in_array($a->module, $ignored_modules); + + if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet AND !$ignored) { $o = $o.'
'.sprintf(t("Database: %s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s"), round($a->performance["database"], 3), round($a->performance["network"], 3), From 04eb464835f8240d8db471fbd9c4fdbfb77ffd34 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 8 Oct 2016 20:58:57 -0400 Subject: [PATCH 03/58] [ifttt] Add missing nickname in the callback URL --- ifttt/ifttt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index b0e5e122a..382365095 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -48,7 +48,7 @@ function ifttt_settings(&$a,&$s) { $s .= '
'; $s .= '

'.t("Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form 'if Facebook then Maker') with the following parameters:").'

'; $s .= '

URL

'; - $s .= '

'.$a->get_baseurl()."/ifttt/".'

'; + $s .= '

' . $a->get_baseurl() . '/ifttt/' . $a->user['nickname'] . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; From 71f988d1bf42f512e9fef75aff3e467172f28a46 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 11 Oct 2016 08:35:46 +0200 Subject: [PATCH 04/58] ES update to the translations THX Athalbert --- appnet/lang/es/messages.po | 117 ++++++++++++++++++++++++++++ appnet/lang/es/strings.php | 29 +++++++ blogger/lang/es/messages.po | 55 +++++++++++++ blogger/lang/es/strings.php | 27 ++++--- buffer/lang/es/messages.po | 75 ++++++++++++++++++ buffer/lang/es/strings.php | 21 +++++ buglink/lang/es/messages.po | 23 ++++++ buglink/lang/es/strings.php | 11 ++- cal/lang/es/messages.po | 55 +++++++++++++ cal/lang/es/strings.php | 16 ++++ communityhome/lang/es/messages.po | 73 ++++++++++++++++++ communityhome/lang/es/strings.php | 34 +++++---- twitter/lang/es/messages.po | 123 ++++++++++++++++++++++++++++++ twitter/lang/es/strings.php | 49 +++++++----- 14 files changed, 660 insertions(+), 48 deletions(-) create mode 100644 appnet/lang/es/messages.po create mode 100644 appnet/lang/es/strings.php create mode 100644 blogger/lang/es/messages.po create mode 100644 buffer/lang/es/messages.po create mode 100644 buffer/lang/es/strings.php create mode 100644 buglink/lang/es/messages.po create mode 100644 cal/lang/es/messages.po create mode 100644 cal/lang/es/strings.php create mode 100644 communityhome/lang/es/messages.po create mode 100644 twitter/lang/es/messages.po diff --git a/appnet/lang/es/messages.po b/appnet/lang/es/messages.po new file mode 100644 index 000000000..78d083d4f --- /dev/null +++ b/appnet/lang/es/messages.po @@ -0,0 +1,117 @@ +# ADDON appnet +# Copyright (C) +# This file is distributed under the same license as the Friendica appnet addon package. +# +# +# Translators: +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-10 17:59+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" + +#: 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 "

Error fetching token. Please try again.

" +msgstr "

Advertencia de error. Por favor inténtelo de nuevo.

" + +#: 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 "" +"

Error fetching user profile. Please clear the configuration and try " +"again.

" +msgstr "

Advertencia de error de perfil. Por favor borre la configuración e inténtelo de nuevo.

" + +#: appnet.php:164 +msgid "

You have two ways to connect to App.net.

" +msgstr "

Tiene dos formas de conectar a App.net.

" + +#: appnet.php:166 +msgid "" +"

First way: Register an application at https://account.app.net/developer/apps/" +" and enter Client ID and Client Secret. " +msgstr "" + +#: appnet.php:167 +#, php-format +msgid "Use '%s' as Redirect URI

" +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 "" +"

Second way: fetch a token at http://dev-lite.jonathonduerig.com/. " +msgstr "

Segunda manera: traiga un símbolo a http://dev-lite.jonathonduerig.com/" + +#: appnet.php:178 +msgid "" +"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', " +"'Messages'.

" +msgstr "Seleccione estas posibilidades: 'Básico', 'Continuo', 'Escribir entrada', 'Mensajes públicos', 'Mensajes'.

" + +#: 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" diff --git a/appnet/lang/es/strings.php b/appnet/lang/es/strings.php new file mode 100644 index 000000000..106317995 --- /dev/null +++ b/appnet/lang/es/strings.php @@ -0,0 +1,29 @@ +strings["Permission denied."] = "Permiso denegado"; +$a->strings["You are now authenticated to app.net. "] = "Ahora está autenticado en app.net."; +$a->strings["

Error fetching token. Please try again.

"] = "

Advertencia de error. Por favor inténtelo de nuevo.

"; +$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["

Error fetching user profile. Please clear the configuration and try again.

"] = "

Advertencia de error de perfil. Por favor borre la configuración e inténtelo de nuevo.

"; +$a->strings["

You have two ways to connect to App.net.

"] = "

Tiene dos formas de conectar a App.net.

"; +$a->strings["

First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = ""; +$a->strings["Use '%s' as Redirect URI

"] = "Use '%s' como Redirigir URI"; +$a->strings["Client ID"] = "ID de cliente"; +$a->strings["Client Secret"] = "Secreto de cliente"; +$a->strings["

Second way: fetch a token at http://dev-lite.jonathonduerig.com/. "] = "

Segunda manera: traiga un símbolo a http://dev-lite.jonathonduerig.com/"; +$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.

"] = "Seleccione estas posibilidades: 'Básico', 'Continuo', 'Escribir entrada', 'Mensajes públicos', 'Mensajes'.

"; +$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"; diff --git a/blogger/lang/es/messages.po b/blogger/lang/es/messages.po new file mode 100644 index 000000000..86b1dcb7a --- /dev/null +++ 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" diff --git a/blogger/lang/es/strings.php b/blogger/lang/es/strings.php index 3ef963d93..01441ae5a 100644 --- a/blogger/lang/es/strings.php +++ b/blogger/lang/es/strings.php @@ -1,11 +1,16 @@ -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"; +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"; diff --git a/buffer/lang/es/messages.po b/buffer/lang/es/messages.po new file mode 100644 index 000000000..20ceacaed --- /dev/null +++ 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" diff --git a/buffer/lang/es/strings.php b/buffer/lang/es/strings.php new file mode 100644 index 000000000..15c58cd1b --- /dev/null +++ b/buffer/lang/es/strings.php @@ -0,0 +1,21 @@ +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"; diff --git a/buglink/lang/es/messages.po b/buglink/lang/es/messages.po new file mode 100644 index 000000000..d17209d54 --- /dev/null +++ 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" diff --git a/buglink/lang/es/strings.php b/buglink/lang/es/strings.php index fe6324886..27e45c1b9 100644 --- a/buglink/lang/es/strings.php +++ b/buglink/lang/es/strings.php @@ -1,3 +1,8 @@ -strings["Report Bug"] = "Informe de errores"; +strings["Report Bug"] = "Reportar error"; diff --git a/cal/lang/es/messages.po b/cal/lang/es/messages.po new file mode 100644 index 000000000..65b2a322c --- /dev/null +++ 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" diff --git a/cal/lang/es/strings.php b/cal/lang/es/strings.php new file mode 100644 index 000000000..29c9cc931 --- /dev/null +++ b/cal/lang/es/strings.php @@ -0,0 +1,16 @@ +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"; diff --git a/communityhome/lang/es/messages.po b/communityhome/lang/es/messages.po new file mode 100644 index 000000000..40be2be16 --- /dev/null +++ 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" diff --git a/communityhome/lang/es/strings.php b/communityhome/lang/es/strings.php index 25cea3ef0..5023d6319 100644 --- a/communityhome/lang/es/strings.php +++ b/communityhome/lang/es/strings.php @@ -1,14 +1,20 @@ -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"; +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"; diff --git a/twitter/lang/es/messages.po b/twitter/lang/es/messages.po new file mode 100644 index 000000000..6cb699489 --- /dev/null +++ b/twitter/lang/es/messages.po @@ -0,0 +1,123 @@ +# ADDON twitter +# Copyright (C) +# This file is distributed under the same license as the Friendica twitter addon package. +# +# +# Translators: +# Athalbert, 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-10 15:07+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" + +#: twitter.php:77 +msgid "Post to Twitter" +msgstr "Entrada para Twitter" + +#: twitter.php:129 +msgid "Twitter settings updated." +msgstr "Ajustes de Twitter actualizados." + +#: twitter.php:157 +msgid "Twitter Posting Settings" +msgstr "Ajustes de publicación de Twitter" + +#: twitter.php:164 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." +msgstr "No hay par de claves para encuentro de Twitter." + +#: twitter.php:183 +msgid "" +"At this Friendica instance the Twitter plugin was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input" +" box below and submit the form. Only your public posts will" +" be posted to Twitter." +msgstr "En esta petición de Friendica el plugin de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter" + +#: twitter.php:184 +msgid "Log in with Twitter" +msgstr "Iniciar sesión con Twitter" + +#: twitter.php:186 +msgid "Copy the PIN from Twitter here" +msgstr "Copie el PIN de Twitter aquí" + +#: twitter.php:191 twitter.php:229 twitter.php:556 +msgid "Submit" +msgstr "Enviar" + +#: twitter.php:200 +msgid "Currently connected to: " +msgstr "Moneda conectada a:" + +#: twitter.php:201 +msgid "" +"If enabled all your public postings can be posted to the " +"associated Twitter account. You can choose to do so by default (here) or for" +" every posting separately in the posting options when writing the entry." +msgstr "Si habilita todas sus publicaciones públicas pueden ser publicadas en la cuenta de Twitter asociada. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de entrada cuando escriba la entrada." + +#: twitter.php:203 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "Nota: Debido a sus ajustes de privacidad (¿Ocultar sus detalles de perfil de espectadores desconocidos?) el enlace potencialmente incluido en publicaciones públicas relevado a Twitter llevará al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido." + +#: twitter.php:206 +msgid "Allow posting to Twitter" +msgstr "Permitir publicar en Twitter" + +#: twitter.php:209 +msgid "Send public postings to Twitter by default" +msgstr "Enviar publicaciones públicas a Twitter por defecto" + +#: twitter.php:213 +msgid "Mirror all posts from twitter that are no replies or retweets" +msgstr "Reflejar todas las publicaciones de Twitter que no son respuestas o retweets." + +#: twitter.php:217 +msgid "Shortening method that optimizes the tweet" +msgstr "Método de corte the optimiza el tweet" + +#: twitter.php:221 +msgid "Send linked #-tags and @-names to Twitter" +msgstr "Enviar #-etiquetas enlazadas y @-nombres a Twitter" + +#: twitter.php:226 +msgid "Clear OAuth configuration" +msgstr "Borrar configuración OAuth" + +#: twitter.php:550 +msgid "Settings updated." +msgstr "Ajustes actualizados" + +#: twitter.php:558 +msgid "Consumer key" +msgstr "Clave de consumidor" + +#: twitter.php:559 +msgid "Consumer secret" +msgstr "Secreto de consumidor" + +#: twitter.php:560 +msgid "Name of the Twitter Application" +msgstr "Nombre de la aplicación de Twitter" + +#: twitter.php:560 +msgid "" +"set this to avoid mirroring postings from ~friendica back to ~friendica" +msgstr "Fijar esto para evitar el reflejo de publicaciones de ~friendica de vuelta a ~friendica" diff --git a/twitter/lang/es/strings.php b/twitter/lang/es/strings.php index 2169f3935..c1168e4a0 100644 --- a/twitter/lang/es/strings.php +++ b/twitter/lang/es/strings.php @@ -1,20 +1,29 @@ -strings["Post to Twitter"] = "Publicar en Twitter"; -$a->strings["Twitter settings updated."] = "Actualización de la configuración de Twitter"; -$a->strings["Twitter Posting Settings"] = "Configuración de publicaciones en Twitter"; -$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se ha encontrado ningún par de claves para Twitter. Póngase en contacto con el administrador del sitio."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta instalación de Friendica el módulo de Twitter está activo pero aún no has conectado tu cuenta con la de Twitter. Para hacerlo, pulsa en el siguiente botón para obtener un PIN de Twitter, que deberás introducir en la casilla de abajo y enviar el formulario. Unicamente el contenido público que publiques será publicado en Twitter."; -$a->strings["Log in with Twitter"] = "Acceder con Twitter"; -$a->strings["Copy the PIN from Twitter here"] = "Copia el PIN de Twitter aquí"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Currently connected to: "] = "Actualmente conectado a:"; -$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas serán publicadas en la cuenta de Twitter asociada. Puedes elegir hacerlo por defecto (aquí) o individualmente para cada publicación usando las opciones cuando escribas."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a Twitter conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; -$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter"; -$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto"; -$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar a Twitter las #-etiquetas y @-nombres"; -$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; -$a->strings["Settings updated."] = "Configuración actualizada."; -$a->strings["Consumer key"] = "Clave del usuario"; -$a->strings["Consumer secret"] = "Secreto del usuario"; +strings["Post to Twitter"] = "Entrada para Twitter"; +$a->strings["Twitter settings updated."] = "Ajustes de Twitter actualizados."; +$a->strings["Twitter Posting Settings"] = "Ajustes de publicación de Twitter"; +$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No hay par de claves para encuentro de Twitter."; +$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta petición de Friendica el plugin de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter"; +$a->strings["Log in with Twitter"] = "Iniciar sesión con Twitter"; +$a->strings["Copy the PIN from Twitter here"] = "Copie el PIN de Twitter aquí"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Currently connected to: "] = "Moneda conectada a:"; +$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si habilita todas sus publicaciones públicas pueden ser publicadas en la cuenta de Twitter asociada. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de entrada cuando escriba la entrada."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a sus ajustes de privacidad (¿Ocultar sus detalles de perfil de espectadores desconocidos?) el enlace potencialmente incluido en publicaciones públicas relevado a Twitter llevará al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido."; +$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter"; +$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto"; +$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Reflejar todas las publicaciones de Twitter que no son respuestas o retweets."; +$a->strings["Shortening method that optimizes the tweet"] = "Método de corte the optimiza el tweet"; +$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar #-etiquetas enlazadas y @-nombres a Twitter"; +$a->strings["Clear OAuth configuration"] = "Borrar configuración OAuth"; +$a->strings["Settings updated."] = "Ajustes actualizados"; +$a->strings["Consumer key"] = "Clave de consumidor"; +$a->strings["Consumer secret"] = "Secreto de consumidor"; +$a->strings["Name of the Twitter Application"] = "Nombre de la aplicación de Twitter"; +$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Fijar esto para evitar el reflejo de publicaciones de ~friendica de vuelta a ~friendica"; From 1d100905a2f9baf64e1644b9d55c2cdbe8299b6d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 13 Oct 2016 07:21:34 +0200 Subject: [PATCH 05/58] =?UTF-8?q?ES=20update=20to=20the=20translations=20T?= =?UTF-8?q?HX=20Alberto=20D=C3=ADaz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openstreetmap/lang/es/messages.po | 46 ++++++++++++++++++++++ openstreetmap/lang/es/strings.php | 21 ++++++---- piwik/lang/es/messages.po | 64 +++++++++++++++++++++++++++++++ piwik/lang/es/strings.php | 27 +++++++------ planets/lang/es/messages.po | 32 ++++++++++++++++ planets/lang/es/strings.php | 15 +++++--- tumblr/lang/es/messages.po | 64 +++++++++++++++++++++++++++++++ tumblr/lang/es/strings.php | 26 +++++++++---- 8 files changed, 263 insertions(+), 32 deletions(-) create mode 100644 openstreetmap/lang/es/messages.po create mode 100644 piwik/lang/es/messages.po create mode 100644 planets/lang/es/messages.po create mode 100644 tumblr/lang/es/messages.po diff --git a/openstreetmap/lang/es/messages.po b/openstreetmap/lang/es/messages.po new file mode 100644 index 000000000..c7db998b3 --- /dev/null +++ b/openstreetmap/lang/es/messages.po @@ -0,0 +1,46 @@ +# ADDON openstreetmap +# Copyright (C) +# This file is distributed under the same license as the Friendica openstreetmap addon package. +# +# +# Translators: +# Alberto Díaz , 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:01+0000\n" +"Last-Translator: Alberto Díaz \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" + +#: openstreetmap.php:94 +msgid "Submit" +msgstr "Enviar" + +#: openstreetmap.php:95 +msgid "Tile Server URL" +msgstr "URL del mosaico de servidor" + +#: openstreetmap.php:95 +msgid "" +"A list of public tile servers" +msgstr "Una lista de mosaico de servidores públicos" + +#: openstreetmap.php:96 +msgid "Default zoom" +msgstr "Zoom por defecto" + +#: openstreetmap.php:96 +msgid "The default zoom level. (1:world, 18:highest)" +msgstr "El nivel por defecto de zoom. (1:world, 18:highest)" + +#: openstreetmap.php:104 +msgid "Settings updated." +msgstr "Ajustes actualizados" diff --git a/openstreetmap/lang/es/strings.php b/openstreetmap/lang/es/strings.php index 0c40375e6..d8a59d0e0 100644 --- a/openstreetmap/lang/es/strings.php +++ b/openstreetmap/lang/es/strings.php @@ -1,8 +1,13 @@ -strings["Submit"] = "Envíar"; -$a->strings["Tile Server URL"] = "Dirección del servidor"; -$a->strings["A list of public tile servers"] = "Un listado de servidores públicos"; -$a->strings["Default zoom"] = "Zoom por defecto"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivel de zoom predeterminado. (1:mínimo, 18:máximo)"; -$a->strings["Settings updated."] = "Configuración actualizada."; +strings["Submit"] = "Enviar"; +$a->strings["Tile Server URL"] = "URL del mosaico de servidor"; +$a->strings["A list of public tile servers"] = "Una lista de mosaico de servidores públicos"; +$a->strings["Default zoom"] = "Zoom por defecto"; +$a->strings["The default zoom level. (1:world, 18:highest)"] = "El nivel por defecto de zoom. (1:world, 18:highest)"; +$a->strings["Settings updated."] = "Ajustes actualizados"; diff --git a/piwik/lang/es/messages.po b/piwik/lang/es/messages.po new file mode 100644 index 000000000..fff8cea3b --- /dev/null +++ b/piwik/lang/es/messages.po @@ -0,0 +1,64 @@ +# ADDON piwik +# Copyright (C) +# This file is distributed under the same license as the Friendica piwik addon package. +# +# +# Translators: +# Alberto Díaz , 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-26 12:49+0200\n" +"PO-Revision-Date: 2016-10-12 14:57+0000\n" +"Last-Translator: Alberto Díaz \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" + +#: piwik.php:79 +msgid "" +"This website is tracked using the Piwik " +"analytics tool." +msgstr "Esta página es rastreada usando la herramienta analítica Piwik." + +#: piwik.php:82 +#, php-format +msgid "" +"If you do not want that your visits are logged in this way you can set a cookie to prevent Piwik from tracking further visits of " +"the site (opt-out)." +msgstr "Si no quiere que sus visitas sean registradas puede seleccionar una cookie para evitar que Piwik rastree más visitas de la página (cláusula de opción)." + +#: piwik.php:89 +msgid "Save Settings" +msgstr "Guardar ajustes" + +#: piwik.php:90 +msgid "Piwik Base URL" +msgstr "URL Base de Piwik" + +#: piwik.php:90 +msgid "" +"Absolute path to your Piwik installation. (without protocol (http/s), with " +"trailing slash)" +msgstr "Camino a la instalación de su Piwik. (sin protocolo (http/s), con corte de cola)" + +#: piwik.php:91 +msgid "Site ID" +msgstr "ID de la página" + +#: piwik.php:92 +msgid "Show opt-out cookie link?" +msgstr "Mostrar enlace a cláusula de opción de cookie" + +#: piwik.php:93 +msgid "Asynchronous tracking" +msgstr "Rastreo asíncrono" + +#: piwik.php:105 +msgid "Settings updated." +msgstr "Ajustes actualizados" diff --git a/piwik/lang/es/strings.php b/piwik/lang/es/strings.php index 59e264ae3..96a61a4ab 100644 --- a/piwik/lang/es/strings.php +++ b/piwik/lang/es/strings.php @@ -1,11 +1,16 @@ -strings["This website is tracked using the Piwik analytics tool."] = "Este sitio realiza un seguimiento mediante la herramienta de análisis Piwik."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no quieres que tus visitas sean registradas de esta manera puedes establecer una cookie para evitar que Piwik realice un seguimiento de las visitas del sitio (opt-out)."; -$a->strings["Submit"] = "Envíar"; -$a->strings["Piwik Base URL"] = "Dirección base Piwik"; -$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Ruta absoluta a tu instalación de Piwik (sin el protocolo (http/s) pero con la barra)."; -$a->strings["Site ID"] = "ID del sitio"; -$a->strings["Show opt-out cookie link?"] = "¿Mostrar enlace a las cookies?"; -$a->strings["Asynchronous tracking"] = "Seguimiento asíncrono"; -$a->strings["Settings updated."] = "Configuración actualizada."; +strings["This website is tracked using the Piwik analytics tool."] = "Esta página es rastreada usando la herramienta analítica Piwik."; +$a->strings["If you do not want that your visits are logged in this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Si no quiere que sus visitas sean registradas puede seleccionar una cookie para evitar que Piwik rastree más visitas de la página (cláusula de opción)."; +$a->strings["Save Settings"] = "Guardar ajustes"; +$a->strings["Piwik Base URL"] = "URL Base de Piwik"; +$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Camino a la instalación de su Piwik. (sin protocolo (http/s), con corte de cola)"; +$a->strings["Site ID"] = "ID de la página"; +$a->strings["Show opt-out cookie link?"] = "Mostrar enlace a cláusula de opción de cookie"; +$a->strings["Asynchronous tracking"] = "Rastreo asíncrono"; +$a->strings["Settings updated."] = "Ajustes actualizados"; diff --git a/planets/lang/es/messages.po b/planets/lang/es/messages.po new file mode 100644 index 000000000..294da0821 --- /dev/null +++ b/planets/lang/es/messages.po @@ -0,0 +1,32 @@ +# ADDON planets +# Copyright (C) +# This file is distributed under the same license as the Friendica planets addon package. +# +# +# Translators: +# Alberto Díaz , 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:12+0000\n" +"Last-Translator: Alberto Díaz \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" + +#: planets.php:150 +msgid "Planets Settings" +msgstr "Ajustes de Planets" + +#: planets.php:152 +msgid "Enable Planets Plugin" +msgstr "Habilite el plugin Planets" + +#: planets.php:158 +msgid "Submit" +msgstr "Enviar" diff --git a/planets/lang/es/strings.php b/planets/lang/es/strings.php index 67b52dcd4..8c7ef65d1 100644 --- a/planets/lang/es/strings.php +++ b/planets/lang/es/strings.php @@ -1,5 +1,10 @@ -strings["Planets Settings"] = "Configuración de Planets"; -$a->strings["Enable Planets Plugin"] = "Activar el módulo de planetas Planets"; -$a->strings["Submit"] = "Envíar"; +strings["Planets Settings"] = "Ajustes de Planets"; +$a->strings["Enable Planets Plugin"] = "Habilite el plugin Planets"; +$a->strings["Submit"] = "Enviar"; diff --git a/tumblr/lang/es/messages.po b/tumblr/lang/es/messages.po new file mode 100644 index 000000000..2f2eb4313 --- /dev/null +++ b/tumblr/lang/es/messages.po @@ -0,0 +1,64 @@ +# ADDON tumblr +# Copyright (C) +# This file is distributed under the same license as the Friendica tumblr addon package. +# +# +# Translators: +# Alberto Díaz , 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:15+0000\n" +"Last-Translator: Alberto Díaz \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" + +#: tumblr.php:34 +msgid "Permission denied." +msgstr "Permiso denegado." + +#: tumblr.php:144 +msgid "You are now authenticated to tumblr." +msgstr "Está ahora autenticado en tumblr." + +#: tumblr.php:145 +msgid "return to the connector page" +msgstr "Vuelva a la página del conector" + +#: tumblr.php:158 +msgid "Post to Tumblr" +msgstr "Publicar en Tumblr" + +#: tumblr.php:185 +msgid "Tumblr Post Settings" +msgstr "Ajustes de publicación de Tumblr" + +#: tumblr.php:188 +msgid "(Re-)Authenticate your tumblr page" +msgstr "(Re-)autenticar su página de tumblr" + +#: tumblr.php:192 +msgid "Enable Tumblr Post Plugin" +msgstr "Habilite el plugin Tumblr Post" + +#: tumblr.php:197 +msgid "Post to Tumblr by default" +msgstr "Publique en Tumblr por defecto" + +#: tumblr.php:217 +msgid "Post to page:" +msgstr "Publicar en página:" + +#: tumblr.php:228 +msgid "You are not authenticated to tumblr" +msgstr "No está autenticado en tumblr" + +#: tumblr.php:233 +msgid "Submit" +msgstr "Enviar" diff --git a/tumblr/lang/es/strings.php b/tumblr/lang/es/strings.php index af34a57c1..3a6e5ce99 100644 --- a/tumblr/lang/es/strings.php +++ b/tumblr/lang/es/strings.php @@ -1,8 +1,18 @@ -strings["Permission denied."] = "Permiso denegado."; -$a->strings["Post to Tumblr"] = "Publicar en Tumblr"; -$a->strings["Tumblr Post Settings"] = "Configuración de publicación en Tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Habilitar el módulo de publicación en Tumblr"; -$a->strings["Post to Tumblr by default"] = "Publicar en Tumblr por defecto"; -$a->strings["Submit"] = "Envíar"; +strings["Permission denied."] = "Permiso denegado."; +$a->strings["You are now authenticated to tumblr."] = "Está ahora autenticado en tumblr."; +$a->strings["return to the connector page"] = "Vuelva a la página del conector"; +$a->strings["Post to Tumblr"] = "Publicar en Tumblr"; +$a->strings["Tumblr Post Settings"] = "Ajustes de publicación de Tumblr"; +$a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)autenticar su página de tumblr"; +$a->strings["Enable Tumblr Post Plugin"] = "Habilite el plugin Tumblr Post"; +$a->strings["Post to Tumblr by default"] = "Publique en Tumblr por defecto"; +$a->strings["Post to page:"] = "Publicar en página:"; +$a->strings["You are not authenticated to tumblr"] = "No está autenticado en tumblr"; +$a->strings["Submit"] = "Enviar"; From dea5b336322d07ac4a1052e87f1d5a622c1527ca Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 7 Nov 2016 05:23:19 +0000 Subject: [PATCH 06/58] Prevent posting loops --- fromgplus/fromgplus.php | 21 ++++++++++++++++----- statusnet/statusnet.php | 3 +++ twitter/twitter.php | 3 +++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index c8026ad3a..4c96892c6 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -39,6 +39,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 .= ''; @@ -57,6 +58,9 @@ function fromgplus_addon_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; $s .= '
'; @@ -74,6 +78,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'); @@ -130,7 +136,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; @@ -158,6 +164,9 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord) { $_REQUEST['source'] = $source; $_REQUEST['extid'] = NETWORK_GPLUS; + if (isset($id)) + $_REQUEST['message_id'] = NETWORK_GPLUS.":".$id; + // $_REQUEST['verb'] // $_REQUEST['parent'] // $_REQUEST['parent_uri'] @@ -327,9 +336,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { // Add Keywords to page link $data = parseurl_getsiteinfo_cached($pagedata["url"], true); - if (isset($data["keywords"])) + if (isset($data["keywords"]) AND get_pconfig($uid, 'fromgplus', 'keywords')) { $pagedata["keywords"] = $data["keywords"]; - + } break; case "photo": @@ -452,6 +461,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; @@ -485,7 +496,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; @@ -536,7 +547,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; } } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 4fdd6a74b..febe4032f 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -872,6 +872,9 @@ function statusnet_fetchtimeline($a, $uid) { $_REQUEST["source"] = $post->source; $_REQUEST["extid"] = NETWORK_STATUSNET; + if (isset($post->id)) + $_REQUEST['message_id'] = NETWORK_STATUSNET.":".$post->id; + //$_REQUEST["date"] = $post->created_at; $_REQUEST["title"] = ""; diff --git a/twitter/twitter.php b/twitter/twitter.php index 8f023dfeb..e7429696d 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -791,6 +791,9 @@ function twitter_fetchtimeline($a, $uid) { $_REQUEST["source"] = $post->source; $_REQUEST["extid"] = NETWORK_TWITTER; + if (isset($post->id)) + $_REQUEST['message_id'] = NETWORK_TWITTER.":".$post->id; + //$_REQUEST["date"] = $post->created_at; $_REQUEST["title"] = ""; From 327b810438ab364adfd962d08def33978b994e37 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:38:52 +0100 Subject: [PATCH 07/58] ES libravatar --- libravatar/lang/es/messages.po | 84 ++++++++++++++++++++++++++++++++++ libravatar/lang/es/strings.php | 39 +++++++++------- 2 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 libravatar/lang/es/messages.po diff --git a/libravatar/lang/es/messages.po b/libravatar/lang/es/messages.po new file mode 100644 index 000000000..a4dd4a43b --- /dev/null +++ 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 , 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 \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.
It requires PHP >= 5.3" +msgstr "Podría NO instalar Libravatar con éxito.
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.
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.
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" diff --git a/libravatar/lang/es/strings.php b/libravatar/lang/es/strings.php index a746d5801..1ab20cf1e 100644 --- a/libravatar/lang/es/strings.php +++ b/libravatar/lang/es/strings.php @@ -1,17 +1,22 @@ -strings["Could NOT install Libravatar successfully.
It requires PHP >= 5.3"] = "Libravatar puede no haberse instalado correctamente.
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.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El complemento Gravatar está instalado. Por favor, desactiva dicho complemento.
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."; +strings["Could NOT install Libravatar successfully.
It requires PHP >= 5.3"] = "Podría NO instalar Libravatar con éxito.
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.
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.
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"; From 26fdee5b2313cbf7172b024b408a7ac206b1d0ba Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:40:07 +0100 Subject: [PATCH 08/58] ES appnet --- appnet/lang/es/messages.po | 7 ++++--- appnet/lang/es/strings.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appnet/lang/es/messages.po b/appnet/lang/es/messages.po index 78d083d4f..a44089d77 100644 --- a/appnet/lang/es/messages.po +++ b/appnet/lang/es/messages.po @@ -4,13 +4,14 @@ # # # Translators: +# Alberto Díaz Tormo , 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-10 17:59+0000\n" -"Last-Translator: Athalbert\n" +"PO-Revision-Date: 2016-10-13 21:25+0000\n" +"Last-Translator: Alberto Díaz Tormo \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" @@ -73,7 +74,7 @@ msgid "" "

First way: Register an application at https://account.app.net/developer/apps/" " and enter Client ID and Client Secret. " -msgstr "" +msgstr "

Primera forma: Registrar una aplicación en https://account.app.net/developer/apps/ y seleccionar Client ID y Client Secret. " #: appnet.php:167 #, php-format diff --git a/appnet/lang/es/strings.php b/appnet/lang/es/strings.php index 106317995..020c6f35c 100644 --- a/appnet/lang/es/strings.php +++ b/appnet/lang/es/strings.php @@ -17,7 +17,7 @@ $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["

Error fetching user profile. Please clear the configuration and try again.

"] = "

Advertencia de error de perfil. Por favor borre la configuración e inténtelo de nuevo.

"; $a->strings["

You have two ways to connect to App.net.

"] = "

Tiene dos formas de conectar a App.net.

"; -$a->strings["

First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = ""; +$a->strings["

First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = "

Primera forma: Registrar una aplicación en https://account.app.net/developer/apps/ y seleccionar Client ID y Client Secret. "; $a->strings["Use '%s' as Redirect URI

' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "

\n"; - } - } - $this->ErrorInfo = $msg; - } - - /** - * Returns the proper RFC 822 formatted date. - * @access public - * @return string - * @static - */ - public static function RFCDate() { - $tz = date('Z'); - $tzs = ($tz < 0) ? '-' : '+'; - $tz = abs($tz); - $tz = (int)($tz/3600)*100 + ($tz%3600)/60; - $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); - - return $result; - } - - /** - * Returns the server hostname or 'localhost.localdomain' if unknown. - * @access protected - * @return string - */ - protected function ServerHostname() { - if (!empty($this->Hostname)) { - $result = $this->Hostname; - } elseif (isset($_SERVER['SERVER_NAME'])) { - $result = $_SERVER['SERVER_NAME']; - } else { - $result = 'localhost.localdomain'; - } - - return $result; - } - - /** - * Returns a message in the appropriate language. - * @access protected - * @param string $key - * @return string - */ - protected function Lang($key) { - if(count($this->language) < 1) { - $this->SetLanguage('en'); // set the default language - } - - if(isset($this->language[$key])) { - return $this->language[$key]; - } else { - return 'Language string failed to load: ' . $key; - } - } - - /** - * Returns true if an error occurred. - * @access public - * @return bool - */ - public function IsError() { - return ($this->error_count > 0); - } - - /** - * Changes every end of line from CRLF, CR or LF to $this->LE. - * @access public - * @param string $str String to FixEOL - * @return string - */ - public function FixEOL($str) { - // condense down to \n - $nstr = str_replace(array("\r\n", "\r"), "\n", $str); - // Now convert LE as needed - if ($this->LE !== "\n") { - $nstr = str_replace("\n", $this->LE, $nstr); - } - return $nstr; - } - - /** - * Adds a custom header. $name value can be overloaded to contain - * both header name and value (name:value) - * @access public - * @param string $name custom header name - * @param string $value header value - * @return void - */ - public function AddCustomHeader($name, $value=null) { - if ($value === null) { - // Value passed in as name:value - $this->CustomHeader[] = explode(':', $name, 2); - } else { - $this->CustomHeader[] = array($name, $value); - } - } - - /** - * Evaluates the message and returns modifications for inline images and backgrounds - * @access public - * @param string $message Text to be HTML modified - * @param string $basedir baseline directory for path - * @return string $message - */ - public function MsgHTML($message, $basedir = '') { - preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images); - if(isset($images[2])) { - foreach($images[2] as $i => $url) { - // do not change urls for absolute images (thanks to corvuscorax) - if (!preg_match('#^[A-z]+://#', $url)) { - $filename = basename($url); - $directory = dirname($url); - if ($directory == '.') { - $directory = ''; - } - $cid = 'cid:' . md5($url); - $ext = pathinfo($filename, PATHINFO_EXTENSION); - $mimeType = self::_mime_types($ext); - if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; } - if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; } - if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($url), $filename, 'base64', $mimeType) ) { - $message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message); - } - } - } - } - $this->IsHTML(true); - $this->Body = $message; - if (empty($this->AltBody)) { - $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message))); - if (!empty($textMsg)) { - $this->AltBody = html_entity_decode($textMsg, ENT_QUOTES, $this->CharSet); - } - } - if (empty($this->AltBody)) { - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; - } - return $message; - } - - /** - * Gets the MIME type of the embedded or inline image - * @param string $ext File extension - * @access public - * @return string MIME type of ext - * @static - */ - public static function _mime_types($ext = '') { - $mimes = array( - 'xl' => 'application/excel', - 'hqx' => 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'bin' => 'application/macbinary', - 'doc' => 'application/msword', - 'word' => 'application/msword', - 'class' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'dms' => 'application/octet-stream', - 'exe' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'psd' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'so' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => 'application/pdf', - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint', - 'wbxml' => 'application/vnd.wap.wbxml', - 'wmlc' => 'application/vnd.wap.wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'php3' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php' => 'application/x-httpd-php', - 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - 'tgz' => 'application/x-tar', - 'xht' => 'application/xhtml+xml', - 'xhtml' => 'application/xhtml+xml', - 'zip' => 'application/zip', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mp2' => 'audio/mpeg', - 'mp3' => 'audio/mpeg', - 'mpga' => 'audio/mpeg', - 'aif' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - 'jpeg' => 'image/jpeg', - 'jpe' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'png' => 'image/png', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'eml' => 'message/rfc822', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', - 'shtml' => 'text/html', - 'log' => 'text/plain', - 'text' => 'text/plain', - 'txt' => 'text/plain', - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mov' => 'video/quicktime', - 'qt' => 'video/quicktime', - 'rv' => 'video/vnd.rn-realvideo', - 'avi' => 'video/x-msvideo', - 'movie' => 'video/x-sgi-movie' - ); - return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)]; - } - - /** - * Set (or reset) Class Objects (variables) - * - * Usage Example: - * $page->set('X-Priority', '3'); - * - * @access public - * @param string $name Parameter Name - * @param mixed $value Parameter Value - * NOTE: will not work with arrays, there are no arrays to set/reset - * @throws phpmailerException - * @return bool - * @todo Should this not be using __set() magic function? - */ - public function set($name, $value = '') { - try { - if (isset($this->$name) ) { - $this->$name = $value; - } else { - throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL); - } - } catch (Exception $e) { - $this->SetError($e->getMessage()); - if ($e->getCode() == self::STOP_CRITICAL) { - return false; - } - } - return true; - } - - /** - * Strips newlines to prevent header injection. - * @access public - * @param string $str String - * @return string - */ - public function SecureHeader($str) { - return trim(str_replace(array("\r", "\n"), '', $str)); - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param $cert_filename - * @param string $key_filename Parameter File Name - * @param string $key_pass Password for private key - */ - public function Sign($cert_filename, $key_filename, $key_pass) { - $this->sign_cert_file = $cert_filename; - $this->sign_key_file = $key_filename; - $this->sign_key_pass = $key_pass; - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param string $txt - * @return string - */ - public function DKIM_QP($txt) { - $line = ''; - for ($i = 0; $i < strlen($txt); $i++) { - $ord = ord($txt[$i]); - if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) { - $line .= $txt[$i]; - } else { - $line .= "=".sprintf("%02X", $ord); - } - } - return $line; - } - - /** - * Generate DKIM signature - * - * @access public - * @param string $s Header - * @return string - */ - public function DKIM_Sign($s) { - $privKeyStr = file_get_contents($this->DKIM_private); - if ($this->DKIM_passphrase != '') { - $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase); - } else { - $privKey = $privKeyStr; - } - if (openssl_sign($s, $signature, $privKey)) { - return base64_encode($signature); - } - return ''; - } - - /** - * Generate DKIM Canonicalization Header - * - * @access public - * @param string $s Header - * @return string - */ - public function DKIM_HeaderC($s) { - $s = preg_replace("/\r\n\s+/", " ", $s); - $lines = explode("\r\n", $s); - foreach ($lines as $key => $line) { - list($heading, $value) = explode(":", $line, 2); - $heading = strtolower($heading); - $value = preg_replace("/\s+/", " ", $value) ; // Compress useless spaces - $lines[$key] = $heading.":".trim($value) ; // Don't forget to remove WSP around the value - } - $s = implode("\r\n", $lines); - return $s; - } - - /** - * Generate DKIM Canonicalization Body - * - * @access public - * @param string $body Message Body - * @return string - */ - public function DKIM_BodyC($body) { - if ($body == '') return "\r\n"; - // stabilize line endings - $body = str_replace("\r\n", "\n", $body); - $body = str_replace("\n", "\r\n", $body); - // END stabilize line endings - while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") { - $body = substr($body, 0, strlen($body) - 2); - } - return $body; - } - - /** - * Create the DKIM header, body, as new header - * - * @access public - * @param string $headers_line Header lines - * @param string $subject Subject - * @param string $body Body - * @return string - */ - public function DKIM_Add($headers_line, $subject, $body) { - $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms - $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body - $DKIMquery = 'dns/txt'; // Query method - $DKIMtime = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) - $subject_header = "Subject: $subject"; - $headers = explode($this->LE, $headers_line); - $from_header = ""; - $to_header = ""; - foreach($headers as $header) { - if (strpos($header, 'From:') === 0) { - $from_header = $header; - } elseif (strpos($header, 'To:') === 0) { - $to_header = $header; - } - } - $from = str_replace('|', '=7C', $this->DKIM_QP($from_header)); - $to = str_replace('|', '=7C', $this->DKIM_QP($to_header)); - $subject = str_replace('|', '=7C', $this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable - $body = $this->DKIM_BodyC($body); - $DKIMlen = strlen($body) ; // Length of body - $DKIMb64 = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body - $ident = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";"; - $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n". - "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n". - "\th=From:To:Subject;\r\n". - "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n". - "\tz=$from\r\n". - "\t|$to\r\n". - "\t|$subject;\r\n". - "\tbh=" . $DKIMb64 . ";\r\n". - "\tb="; - $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs); - $signed = $this->DKIM_Sign($toSign); - return "X-PHPMAILER-DKIM: code.google.com/a/apache-extras.org/p/phpmailer/\r\n".$dkimhdrs.$signed."\r\n"; - } - - /** - * Perform callback - * @param boolean $isSent - * @param string $to - * @param string $cc - * @param string $bcc - * @param string $subject - * @param string $body - * @param string $from - */ - protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from=null) { - if (!empty($this->action_function) && is_callable($this->action_function)) { - $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from); - call_user_func_array($this->action_function, $params); - } - } -} - -/** - * Exception handler for PHPMailer - * @package PHPMailer - */ -class phpmailerException extends Exception { - /** - * Prettify error message output - * @return string - */ - public function errorMessage() { - $errorMsg = '' . $this->getMessage() . "
\n"; - return $errorMsg; - } -} -?> diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 02a1192b2..e450910d2 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -7,298 +7,298 @@ */ function mailstream_install() { - register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); - register_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); - register_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - register_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - register_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); + register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); + register_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); + register_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + register_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + register_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - if (get_config('mailstream', 'dbversion') == '0.1') { - q('ALTER TABLE `mailstream_item` DROP INDEX `uid`'); - q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`'); - q('ALTER TABLE `mailstream_item` DROP INDEX `plink`'); - q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL'); - set_config('mailstream', 'dbversion', '0.2'); - } - if (get_config('mailstream', 'dbversion') == '0.2') { - q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"'); - set_config('mailstream', 'dbversion', '0.3'); - } - if (get_config('mailstream', 'dbversion') == '0.3') { - q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()'); - q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL'); - set_config('mailstream', 'dbversion', '0.4'); - } - if (get_config('mailstream', 'dbversion') == '0.4') { - q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'); - set_config('mailstream', 'dbversion', '0.5'); - } - if (get_config('mailstream', 'dbversion') == '0.5') { - set_config('mailstream', 'dbversion', '1.0'); - } + if (get_config('mailstream', 'dbversion') == '0.1') { + q('ALTER TABLE `mailstream_item` DROP INDEX `uid`'); + q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`'); + q('ALTER TABLE `mailstream_item` DROP INDEX `plink`'); + q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL'); + set_config('mailstream', 'dbversion', '0.2'); + } + if (get_config('mailstream', 'dbversion') == '0.2') { + q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"'); + set_config('mailstream', 'dbversion', '0.3'); + } + if (get_config('mailstream', 'dbversion') == '0.3') { + q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()'); + q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL'); + set_config('mailstream', 'dbversion', '0.4'); + } + if (get_config('mailstream', 'dbversion') == '0.4') { + q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'); + set_config('mailstream', 'dbversion', '0.5'); + } + if (get_config('mailstream', 'dbversion') == '0.5') { + set_config('mailstream', 'dbversion', '1.0'); + } - if (get_config('retriever', 'dbversion') != '1.0') { - $schema = file_get_contents(dirname(__file__).'/database.sql'); - $arr = explode(';', $schema); - foreach ($arr as $a) { - $r = q($a); - } - set_config('mailstream', 'dbversion', '1.0'); - } + if (get_config('retriever', 'dbversion') != '1.0') { + $schema = file_get_contents(dirname(__file__).'/database.sql'); + $arr = explode(';', $schema); + foreach ($arr as $a) { + $r = q($a); + } + set_config('mailstream', 'dbversion', '1.0'); + } } function mailstream_uninstall() { - unregister_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); - unregister_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); - unregister_hook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - unregister_hook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - unregister_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - unregister_hook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); + unregister_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); + unregister_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); + unregister_hook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); + unregister_hook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); + unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); + unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); + unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + unregister_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); + unregister_hook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); } function mailstream_module() {} function mailstream_plugin_admin(&$a,&$o) { - $frommail = get_config('mailstream', 'frommail'); - $template = get_markup_template('admin.tpl', 'addon/mailstream/'); - $config = array('frommail', - t('From Address'), - $frommail, - t('Email address that stream items will appear to be from.')); - $o .= replace_macros($template, array( - '$frommail' => $config, - '$submit' => t('Save Settings'))); + $frommail = get_config('mailstream', 'frommail'); + $template = get_markup_template('admin.tpl', 'addon/mailstream/'); + $config = array('frommail', + t('From Address'), + $frommail, + t('Email address that stream items will appear to be from.')); + $o .= replace_macros($template, array( + '$frommail' => $config, + '$submit' => t('Save Settings'))); } function mailstream_plugin_admin_post ($a) { - if (x($_POST, 'frommail')) { - set_config('mailstream', 'frommail', $_POST['frommail']); - } + if (x($_POST, 'frommail')) { + set_config('mailstream', 'frommail', $_POST['frommail']); + } } function mailstream_generate_id($a, $uri) { - // http://www.jwz.org/doc/mid.html - $host = $a->get_hostname(); - $resource = hash('md5', $uri); - $message_id = "<" . $resource . "@" . $host . ">"; - logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG); - return $message_id; + // http://www.jwz.org/doc/mid.html + $host = $a->get_hostname(); + $resource = hash('md5', $uri); + $message_id = "<" . $resource . "@" . $host . ">"; + logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG); + return $message_id; } function mailstream_post_hook(&$a, &$item) { - if (!get_pconfig($item['uid'], 'mailstream', 'enabled')) { - return; - } - if (!$item['uid']) { - return; - } - if (!$item['contact-id']) { - return; - } - if (!$item['uri']) { - return; - } - if (get_pconfig($item['uid'], 'mailstream', 'nolikes')) { - if ($item['verb'] == ACTIVITY_LIKE) { - return; - } - } + if (!get_pconfig($item['uid'], 'mailstream', 'enabled')) { + return; + } + if (!$item['uid']) { + return; + } + if (!$item['contact-id']) { + return; + } + if (!$item['uri']) { + return; + } + if (get_pconfig($item['uid'], 'mailstream', 'nolikes')) { + if ($item['verb'] == ACTIVITY_LIKE) { + return; + } + } - $message_id = mailstream_generate_id($a, $item['uri']); - q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " . - "VALUES (%d, '%s', '%s', '%s')", intval($item['uid']), - intval($item['contact-id']), dbesc($item['uri']), dbesc($message_id)); - $r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), dbesc($item['uri'])); - if (count($r) != 1) { - logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_NORMAL); - return; - } - $ms_item = $r[0]; - logger('mailstream_post_remote_hook: created mailstream_item ' - . $ms_item['id'] . ' for item ' . $item['uri'] . ' ' - . $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA); - $user = mailstream_get_user($item['uid']); - if (!$user) { - logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_NORMAL); - return; - } - mailstream_send($a, $ms_item['message-id'], $item, $user); + $message_id = mailstream_generate_id($a, $item['uri']); + q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " . + "VALUES (%d, '%s', '%s', '%s')", intval($item['uid']), + intval($item['contact-id']), dbesc($item['uri']), dbesc($message_id)); + $r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), dbesc($item['uri'])); + if (count($r) != 1) { + logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_NORMAL); + return; + } + $ms_item = $r[0]; + logger('mailstream_post_remote_hook: created mailstream_item ' + . $ms_item['id'] . ' for item ' . $item['uri'] . ' ' + . $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA); + $user = mailstream_get_user($item['uid']); + if (!$user) { + logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_NORMAL); + return; + } + mailstream_send($a, $ms_item['message-id'], $item, $user); } function mailstream_get_user($uid) { - $r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid)); - if (count($r) != 1) { - logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_NORMAL); - return; - } - return $r[0]; + $r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid)); + if (count($r) != 1) { + logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_NORMAL); + return; + } + return $r[0]; } function mailstream_do_images($a, &$item, &$attachments) { - if (!get_pconfig($item['uid'], 'mailstream', 'attachimg')) { - return; - } - $attachments = array(); - $baseurl = $a->get_baseurl(); - preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1); - preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2); - foreach (array_merge($matches1[3], $matches2[1]) as $url) { - $redirects; - $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); - $attachments[$url] = array( - 'data' => fetch_url($url, true, $redirects, 0, Null, $cookiejar), - 'guid' => hash("crc32", $url), - 'filename' => basename($url), - 'type' => $a->get_curl_content_type()); - if (strlen($attachments[$url]['data'])) { - $item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']); - continue; - } - } - return $attachments; + if (!get_pconfig($item['uid'], 'mailstream', 'attachimg')) { + return; + } + $attachments = array(); + $baseurl = $a->get_baseurl(); + preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1); + preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2); + foreach (array_merge($matches1[3], $matches2[1]) as $url) { + $redirects; + $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); + $attachments[$url] = array( + 'data' => fetch_url($url, true, $redirects, 0, Null, $cookiejar), + 'guid' => hash("crc32", $url), + 'filename' => basename($url), + 'type' => $a->get_curl_content_type()); + if (strlen($attachments[$url]['data'])) { + $item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']); + continue; + } + } + return $attachments; } function mailstream_sender($item) { - $r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']); - if (count($r)) { - $contact = $r[0]; - if ($contact['name'] != $item['author-name']) { - return $contact['name'] . ' - ' . $item['author-name']; - } - } - return $item['author-name']; + $r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']); + if (dbm::is_result($r)) { + $contact = $r[0]; + if ($contact['name'] != $item['author-name']) { + return $contact['name'] . ' - ' . $item['author-name']; + } + } + return $item['author-name']; } function mailstream_decode_subject($subject) { - $html = bbcode($subject); - if (!$html) { - return $subject; - } - $notags = strip_tags($html); - if (!$notags) { - return $subject; - } - $noentity = html_entity_decode($notags); - if (!$noentity) { - return $notags; - } - $nocodes = preg_replace_callback("/(&#[0-9]+;)/", function($m) { return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); }, $noentity); - if (!$nocodes) { - return $noentity; - } - $trimmed = trim($nocodes); - if (!$trimmed) { - return $nocodes; - } - return $trimmed; + $html = bbcode($subject); + if (!$html) { + return $subject; + } + $notags = strip_tags($html); + if (!$notags) { + return $subject; + } + $noentity = html_entity_decode($notags); + if (!$noentity) { + return $notags; + } + $nocodes = preg_replace_callback("/(&#[0-9]+;)/", function($m) { return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); }, $noentity); + if (!$nocodes) { + return $noentity; + } + $trimmed = trim($nocodes); + if (!$trimmed) { + return $nocodes; + } + return $trimmed; } function mailstream_subject($item) { - if ($item['title']) { - return mailstream_decode_subject($item['title']); - } - $parent = $item['thr-parent']; - // Don't look more than 100 levels deep for a subject, in case of loops - for ($i = 0; ($i < 100) && $parent; $i++) { - $r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent)); - if (!count($r)) { - break; - } - if ($r[0]['thr-parent'] === $parent) { - break; - } - if ($r[0]['title']) { - return t('Re:') . ' ' . mailstream_decode_subject($r[0]['title']); - } - $parent = $r[0]['thr-parent']; - } - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", - intval($item['contact-id']), intval($item['uid'])); - $contact = $r[0]; - if ($contact['network'] === 'dfrn') { - return t("Friendica post"); - } - if ($contact['network'] === 'dspr') { - return t("Diaspora post"); - } - if ($contact['network'] === 'face') { - $text = mailstream_decode_subject($item['body']); - // For some reason these do show up in Facebook - $text = preg_replace('/\xA0$/', '', $text); - $subject = (strlen($text) > 150) ? (substr($text, 0, 140) . '...') : $text; - return preg_replace('/\\s+/', ' ', $subject); - } - if ($contact['network'] === 'feed') { - return t("Feed item"); - } - if ($contact['network'] === 'mail') { - return t("Email"); - } - return t("Friendica Item"); + if ($item['title']) { + return mailstream_decode_subject($item['title']); + } + $parent = $item['thr-parent']; + // Don't look more than 100 levels deep for a subject, in case of loops + for ($i = 0; ($i < 100) && $parent; $i++) { + $r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent)); + if (!dbm::is_result($r)) { + break; + } + if ($r[0]['thr-parent'] === $parent) { + break; + } + if ($r[0]['title']) { + return t('Re:') . ' ' . mailstream_decode_subject($r[0]['title']); + } + $parent = $r[0]['thr-parent']; + } + $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", + intval($item['contact-id']), intval($item['uid'])); + $contact = $r[0]; + if ($contact['network'] === 'dfrn') { + return t("Friendica post"); + } + if ($contact['network'] === 'dspr') { + return t("Diaspora post"); + } + if ($contact['network'] === 'face') { + $text = mailstream_decode_subject($item['body']); + // For some reason these do show up in Facebook + $text = preg_replace('/\xA0$/', '', $text); + $subject = (strlen($text) > 150) ? (substr($text, 0, 140) . '...') : $text; + return preg_replace('/\\s+/', ' ', $subject); + } + if ($contact['network'] === 'feed') { + return t("Feed item"); + } + if ($contact['network'] === 'mail') { + return t("Email"); + } + return t("Friendica Item"); } function mailstream_send($a, $message_id, $item, $user) { - if (!$item['visible']) { - return; - } - if (!$message_id) { - return; - } - require_once(dirname(__file__).'/class.phpmailer.php'); - require_once('include/bbcode.php'); - $attachments = array(); - mailstream_do_images($a, $item, $attachments); - $frommail = get_config('mailstream', 'frommail'); - if ($frommail == "") { - $frommail = 'friendica@localhost.local'; - } - $address = get_pconfig($item['uid'], 'mailstream', 'address'); - if (!$address) { - $address = $user['email']; - } - $mail = new PHPmailer; - try { - $mail->XMailer = 'Friendica Mailstream Plugin'; - $mail->SetFrom($frommail, mailstream_sender($item)); - $mail->AddAddress($address, $user['username']); - $mail->MessageID = $message_id; - $mail->Subject = mailstream_subject($item); - if ($item['thr-parent'] != $item['uri']) { - $mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($a, $item['thr-parent'])); - } - $mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']); - $mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']); - $encoding = 'base64'; - foreach ($attachments as $url => $image) { - $mail->AddStringEmbeddedImage($image['data'], $image['guid'], $image['filename'], $encoding, $image['type']); - } - $mail->IsHTML(true); - $mail->CharSet = 'utf-8'; - $template = get_markup_template('mail.tpl', 'addon/mailstream/'); - $item['body'] = bbcode($item['body']); - $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id']; - $mail->Body = replace_macros($template, array( - '$upstream' => t('Upstream'), - '$local' => t('Local'), - '$item' => $item)); - mailstream_html_wrap($mail->Body); - if (!$mail->Send()) { - throw new Exception($mail->ErrorInfo); - } - logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG); - } catch (phpmailerException $e) { - logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_NORMAL); - } catch (Exception $e) { - logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_NORMAL); - } - // In case of failure, still set the item to completed. Otherwise - // we'll just try to send it over and over again and it'll fail - // every time. - q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', dbesc($message_id)); + if (!$item['visible']) { + return; + } + if (!$message_id) { + return; + } + require_once(dirname(__file__).'/phpmailer/class.phpmailer.php'); + require_once('include/bbcode.php'); + $attachments = array(); + mailstream_do_images($a, $item, $attachments); + $frommail = get_config('mailstream', 'frommail'); + if ($frommail == "") { + $frommail = 'friendica@localhost.local'; + } + $address = get_pconfig($item['uid'], 'mailstream', 'address'); + if (!$address) { + $address = $user['email']; + } + $mail = new PHPmailer; + try { + $mail->XMailer = 'Friendica Mailstream Plugin'; + $mail->SetFrom($frommail, mailstream_sender($item)); + $mail->AddAddress($address, $user['username']); + $mail->MessageID = $message_id; + $mail->Subject = mailstream_subject($item); + if ($item['thr-parent'] != $item['uri']) { + $mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($a, $item['thr-parent'])); + } + $mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']); + $mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']); + $encoding = 'base64'; + foreach ($attachments as $url => $image) { + $mail->AddStringEmbeddedImage($image['data'], $image['guid'], $image['filename'], $encoding, $image['type']); + } + $mail->IsHTML(true); + $mail->CharSet = 'utf-8'; + $template = get_markup_template('mail.tpl', 'addon/mailstream/'); + $item['body'] = bbcode($item['body']); + $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id']; + $mail->Body = replace_macros($template, array( + '$upstream' => t('Upstream'), + '$local' => t('Local'), + '$item' => $item)); + mailstream_html_wrap($mail->Body); + if (!$mail->Send()) { + throw new Exception($mail->ErrorInfo); + } + logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG); + } catch (phpmailerException $e) { + logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_NORMAL); + } catch (Exception $e) { + logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_NORMAL); + } + // In case of failure, still set the item to completed. Otherwise + // we'll just try to send it over and over again and it'll fail + // every time. + q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', dbesc($message_id)); } /** @@ -308,102 +308,101 @@ function mailstream_send($a, $message_id, $item, $user) { */ function mailstream_html_wrap(&$text) { - $lines = str_split($text, 200); - for ($i = 0; $i < count($lines); $i++) - { - $lines[$i] = preg_replace('/ /', "\n", $lines[$i], 1); - } - $text = implode($lines); + $lines = str_split($text, 200); + for ($i = 0; $i < count($lines); $i++) { + $lines[$i] = preg_replace('/ /', "\n", $lines[$i], 1); + } + $text = implode($lines); } function mailstream_cron($a, $b) { - // Only process items older than an hour in cron. This is because - // we want to give mailstream_post_remote_hook a fair chance to - // send the email itself before cron jumps in. Only if - // mailstream_post_remote_hook fails for some reason will this get - // used, and in that case it's worth holding off a bit anyway. - $ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100"); - logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG); - foreach ($ms_item_ids as $ms_item_id) { - if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) { - logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_NORMAL); - } - $items = q('SELECT * FROM `item` WHERE `id` = %d', $ms_item_id['id']); - $item = $items[0]; - $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid'])); - $user = $users[0]; - if ($user && $item) { - mailstream_send($a, $ms_item_id['message-id'], $item, $user); - } - else { - logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_NORMAL); - q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id'])); - } - } - mailstream_tidy(); + // Only process items older than an hour in cron. This is because + // we want to give mailstream_post_remote_hook a fair chance to + // send the email itself before cron jumps in. Only if + // mailstream_post_remote_hook fails for some reason will this get + // used, and in that case it's worth holding off a bit anyway. + $ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100"); + logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG); + foreach ($ms_item_ids as $ms_item_id) { + if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) { + logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_NORMAL); + } + $items = q('SELECT * FROM `item` WHERE `id` = %d', $ms_item_id['id']); + $item = $items[0]; + $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid'])); + $user = $users[0]; + if ($user && $item) { + mailstream_send($a, $ms_item_id['message-id'], $item, $user); + } + else { + logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_NORMAL); + q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id'])); + } + } + mailstream_tidy(); } function mailstream_plugin_settings(&$a,&$s) { - $enabled = get_pconfig(local_user(), 'mailstream', 'enabled'); - $address = get_pconfig(local_user(), 'mailstream', 'address'); - $nolikes = get_pconfig(local_user(), 'mailstream', 'nolikes'); - $attachimg= get_pconfig(local_user(), 'mailstream', 'attachimg'); - $template = get_markup_template('settings.tpl', 'addon/mailstream/'); - $s .= replace_macros($template, array( - '$enabled' => array( - 'mailstream_enabled', - t('Enabled'), - $enabled), - '$address' => array( - 'mailstream_address', - t('Email Address'), - $address, - t("Leave blank to use your account email address")), - '$nolikes' => array( - 'mailstream_nolikes', - t('Exclude Likes'), - $nolikes, - t("Check this to omit mailing \"Like\" notifications")), - '$attachimg' => array( - 'mailstream_attachimg', - t('Attach Images'), - $attachimg, - t("Download images in posts and attach them to the email. Useful for reading email while offline.")), - '$title' => t('Mail Stream Settings'), - '$submit' => t('Save Settings'))); + $enabled = get_pconfig(local_user(), 'mailstream', 'enabled'); + $address = get_pconfig(local_user(), 'mailstream', 'address'); + $nolikes = get_pconfig(local_user(), 'mailstream', 'nolikes'); + $attachimg= get_pconfig(local_user(), 'mailstream', 'attachimg'); + $template = get_markup_template('settings.tpl', 'addon/mailstream/'); + $s .= replace_macros($template, array( + '$enabled' => array( + 'mailstream_enabled', + t('Enabled'), + $enabled), + '$address' => array( + 'mailstream_address', + t('Email Address'), + $address, + t("Leave blank to use your account email address")), + '$nolikes' => array( + 'mailstream_nolikes', + t('Exclude Likes'), + $nolikes, + t("Check this to omit mailing \"Like\" notifications")), + '$attachimg' => array( + 'mailstream_attachimg', + t('Attach Images'), + $attachimg, + t("Download images in posts and attach them to the email. Useful for reading email while offline.")), + '$title' => t('Mail Stream Settings'), + '$submit' => t('Save Settings'))); } function mailstream_plugin_settings_post($a,$post) { - if ($_POST['mailstream_address'] != "") { - set_pconfig(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); - } - else { - del_pconfig(local_user(), 'mailstream', 'address'); - } - if ($_POST['mailstream_nolikes']) { - set_pconfig(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); - } - else { - del_pconfig(local_user(), 'mailstream', 'nolikes'); - } - if ($_POST['mailstream_enabled']) { - set_pconfig(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); - } - else { - del_pconfig(local_user(), 'mailstream', 'enabled'); - } - if ($_POST['mailstream_attachimg']) { - set_pconfig(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); - } - else { - del_pconfig(local_user(), 'mailstream', 'attachimg'); - } + if ($_POST['mailstream_address'] != "") { + set_pconfig(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); + } + else { + del_pconfig(local_user(), 'mailstream', 'address'); + } + if ($_POST['mailstream_nolikes']) { + set_pconfig(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); + } + else { + del_pconfig(local_user(), 'mailstream', 'nolikes'); + } + if ($_POST['mailstream_enabled']) { + set_pconfig(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); + } + else { + del_pconfig(local_user(), 'mailstream', 'enabled'); + } + if ($_POST['mailstream_attachimg']) { + set_pconfig(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); + } + else { + del_pconfig(local_user(), 'mailstream', 'attachimg'); + } } function mailstream_tidy() { - $r = q("SELECT id FROM mailstream_item WHERE completed IS NOT NULL AND completed < DATE_SUB(NOW(), INTERVAL 1 YEAR)"); - foreach ($r as $rr) { - q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id'])); - } - logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG); + $r = q("SELECT id FROM mailstream_item WHERE completed IS NOT NULL AND completed < DATE_SUB(NOW(), INTERVAL 1 YEAR)"); + foreach ($r as $rr) { + q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id'])); + } + logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG); } diff --git a/mailstream/phpmailer/LICENSE b/mailstream/phpmailer/LICENSE new file mode 100644 index 000000000..8e0763d1c --- /dev/null +++ b/mailstream/phpmailer/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/mailstream/phpmailer/VERSION b/mailstream/phpmailer/VERSION new file mode 100644 index 000000000..567eefa2c --- /dev/null +++ b/mailstream/phpmailer/VERSION @@ -0,0 +1 @@ +5.2.21 diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php new file mode 100644 index 000000000..8ff13f110 --- /dev/null +++ b/mailstream/phpmailer/class.phpmailer.php @@ -0,0 +1,4025 @@ + + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + * @copyright 2012 - 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer - PHP email creation and transport class. + * @package PHPMailer + * @author Marcus Bointon (Synchro/coolbru) + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + */ +class PHPMailer +{ + /** + * The PHPMailer Version number. + * @var string + */ + public $Version = '5.2.21'; + + /** + * Email priority. + * Options: null (default), 1 = High, 3 = Normal, 5 = low. + * When null, the header is not set at all. + * @var integer + */ + public $Priority = null; + + /** + * The character set of the message. + * @var string + */ + public $CharSet = 'iso-8859-1'; + + /** + * The MIME Content-type of the message. + * @var string + */ + public $ContentType = 'text/plain'; + + /** + * The message encoding. + * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable". + * @var string + */ + public $Encoding = '8bit'; + + /** + * Holds the most recent mailer error message. + * @var string + */ + public $ErrorInfo = ''; + + /** + * The From email address for the message. + * @var string + */ + public $From = 'root@localhost'; + + /** + * The From name of the message. + * @var string + */ + public $FromName = 'Root User'; + + /** + * The Sender email (Return-Path) of the message. + * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. + * @var string + */ + public $Sender = ''; + + /** + * The Return-Path of the message. + * If empty, it will be set to either From or Sender. + * @var string + * @deprecated Email senders should never set a return-path header; + * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything. + * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference + */ + public $ReturnPath = ''; + + /** + * The Subject of the message. + * @var string + */ + public $Subject = ''; + + /** + * An HTML or plain text message body. + * If HTML then call isHTML(true). + * @var string + */ + public $Body = ''; + + /** + * The plain-text message body. + * This body can be read by mail clients that do not have HTML email + * capability such as mutt & Eudora. + * Clients that can read HTML will view the normal Body. + * @var string + */ + public $AltBody = ''; + + /** + * An iCal message part body. + * Only supported in simple alt or alt_inline message types + * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator + * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/ + * @link http://kigkonsult.se/iCalcreator/ + * @var string + */ + public $Ical = ''; + + /** + * The complete compiled MIME message body. + * @access protected + * @var string + */ + protected $MIMEBody = ''; + + /** + * The complete compiled MIME message headers. + * @var string + * @access protected + */ + protected $MIMEHeader = ''; + + /** + * Extra headers that createHeader() doesn't fold in. + * @var string + * @access protected + */ + protected $mailHeader = ''; + + /** + * Word-wrap the message body to this number of chars. + * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance. + * @var integer + */ + public $WordWrap = 0; + + /** + * Which method to use to send mail. + * Options: "mail", "sendmail", or "smtp". + * @var string + */ + public $Mailer = 'mail'; + + /** + * The path to the sendmail program. + * @var string + */ + public $Sendmail = '/usr/sbin/sendmail'; + + /** + * Whether mail() uses a fully sendmail-compatible MTA. + * One which supports sendmail's "-oi -f" options. + * @var boolean + */ + public $UseSendmailOptions = true; + + /** + * Path to PHPMailer plugins. + * Useful if the SMTP class is not in the PHP include path. + * @var string + * @deprecated Should not be needed now there is an autoloader. + */ + public $PluginDir = ''; + + /** + * The email address that a reading confirmation should be sent to, also known as read receipt. + * @var string + */ + public $ConfirmReadingTo = ''; + + /** + * The hostname to use in the Message-ID header and as default HELO string. + * If empty, PHPMailer attempts to find one with, in order, + * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value + * 'localhost.localdomain'. + * @var string + */ + public $Hostname = ''; + + /** + * An ID to be used in the Message-ID header. + * If empty, a unique id will be generated. + * You can set your own, but it must be in the format "", + * as defined in RFC5322 section 3.6.4 or it will be ignored. + * @see https://tools.ietf.org/html/rfc5322#section-3.6.4 + * @var string + */ + public $MessageID = ''; + + /** + * The message Date to be used in the Date header. + * If empty, the current date will be added. + * @var string + */ + public $MessageDate = ''; + + /** + * SMTP hosts. + * Either a single hostname or multiple semicolon-delimited hostnames. + * You can also specify a different port + * for each host by using this format: [hostname:port] + * (e.g. "smtp1.example.com:25;smtp2.example.com"). + * You can also specify encryption type, for example: + * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465"). + * Hosts will be tried in order. + * @var string + */ + public $Host = 'localhost'; + + /** + * The default SMTP server port. + * @var integer + * @TODO Why is this needed when the SMTP class takes care of it? + */ + public $Port = 25; + + /** + * The SMTP HELO of the message. + * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find + * one with the same method described above for $Hostname. + * @var string + * @see PHPMailer::$Hostname + */ + public $Helo = ''; + + /** + * What kind of encryption to use on the SMTP connection. + * Options: '', 'ssl' or 'tls' + * @var string + */ + public $SMTPSecure = ''; + + /** + * Whether to enable TLS encryption automatically if a server supports it, + * even if `SMTPSecure` is not set to 'tls'. + * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid. + * @var boolean + */ + public $SMTPAutoTLS = true; + + /** + * Whether to use SMTP authentication. + * Uses the Username and Password properties. + * @var boolean + * @see PHPMailer::$Username + * @see PHPMailer::$Password + */ + public $SMTPAuth = false; + + /** + * Options array passed to stream_context_create when connecting via SMTP. + * @var array + */ + public $SMTPOptions = array(); + + /** + * SMTP username. + * @var string + */ + public $Username = ''; + + /** + * SMTP password. + * @var string + */ + public $Password = ''; + + /** + * SMTP auth type. + * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified + * @var string + */ + public $AuthType = ''; + + /** + * SMTP realm. + * Used for NTLM auth + * @var string + */ + public $Realm = ''; + + /** + * SMTP workstation. + * Used for NTLM auth + * @var string + */ + public $Workstation = ''; + + /** + * The SMTP server timeout in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * @var integer + */ + public $Timeout = 300; + + /** + * SMTP class debug output mode. + * Debug output level. + * Options: + * * `0` No output + * * `1` Commands + * * `2` Data and commands + * * `3` As 2 plus connection status + * * `4` Low-level data output + * @var integer + * @see SMTP::$do_debug + */ + public $SMTPDebug = 0; + + /** + * How to handle debug output. + * Options: + * * `echo` Output plain-text as-is, appropriate for CLI + * * `html` Output escaped, line breaks converted to `
`, appropriate for browser output + * * `error_log` Output to error log as configured in php.ini + * + * Alternatively, you can provide a callable expecting two params: a message string and the debug level: + * + * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";}; + * + * @var string|callable + * @see SMTP::$Debugoutput + */ + public $Debugoutput = 'echo'; + + /** + * Whether to keep SMTP connection open after each message. + * If this is set to true then to close the connection + * requires an explicit call to smtpClose(). + * @var boolean + */ + public $SMTPKeepAlive = false; + + /** + * Whether to split multiple to addresses into multiple messages + * or send them all in one message. + * Only supported in `mail` and `sendmail` transports, not in SMTP. + * @var boolean + */ + public $SingleTo = false; + + /** + * Storage for addresses when SingleTo is enabled. + * @var array + * @TODO This should really not be public + */ + public $SingleToArray = array(); + + /** + * Whether to generate VERP addresses on send. + * Only applicable when sending via SMTP. + * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path + * @link http://www.postfix.org/VERP_README.html Postfix VERP info + * @var boolean + */ + public $do_verp = false; + + /** + * Whether to allow sending messages with an empty body. + * @var boolean + */ + public $AllowEmpty = false; + + /** + * The default line ending. + * @note The default remains "\n". We force CRLF where we know + * it must be used via self::CRLF. + * @var string + */ + public $LE = "\n"; + + /** + * DKIM selector. + * @var string + */ + public $DKIM_selector = ''; + + /** + * DKIM Identity. + * Usually the email address used as the source of the email. + * @var string + */ + public $DKIM_identity = ''; + + /** + * DKIM passphrase. + * Used if your key is encrypted. + * @var string + */ + public $DKIM_passphrase = ''; + + /** + * DKIM signing domain name. + * @example 'example.com' + * @var string + */ + public $DKIM_domain = ''; + + /** + * DKIM private key file path. + * @var string + */ + public $DKIM_private = ''; + + /** + * DKIM private key string. + * If set, takes precedence over `$DKIM_private`. + * @var string + */ + public $DKIM_private_string = ''; + + /** + * Callback Action function name. + * + * The function that handles the result of the send email action. + * It is called out by send() for each email sent. + * + * Value can be any php callable: http://www.php.net/is_callable + * + * Parameters: + * boolean $result result of the send action + * string $to email address of the recipient + * string $cc cc email addresses + * string $bcc bcc email addresses + * string $subject the subject + * string $body the email body + * string $from email address of sender + * @var string + */ + public $action_function = ''; + + /** + * What to put in the X-Mailer header. + * Options: An empty string for PHPMailer default, whitespace for none, or a string to use + * @var string + */ + public $XMailer = ''; + + /** + * Which validator to use by default when validating email addresses. + * May be a callable to inject your own validator, but there are several built-in validators. + * @see PHPMailer::validateAddress() + * @var string|callable + * @static + */ + public static $validator = 'auto'; + + /** + * An instance of the SMTP sender class. + * @var SMTP + * @access protected + */ + protected $smtp = null; + + /** + * The array of 'to' names and addresses. + * @var array + * @access protected + */ + protected $to = array(); + + /** + * The array of 'cc' names and addresses. + * @var array + * @access protected + */ + protected $cc = array(); + + /** + * The array of 'bcc' names and addresses. + * @var array + * @access protected + */ + protected $bcc = array(); + + /** + * The array of reply-to names and addresses. + * @var array + * @access protected + */ + protected $ReplyTo = array(); + + /** + * An array of all kinds of addresses. + * Includes all of $to, $cc, $bcc + * @var array + * @access protected + * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc + */ + protected $all_recipients = array(); + + /** + * An array of names and addresses queued for validation. + * In send(), valid and non duplicate entries are moved to $all_recipients + * and one of $to, $cc, or $bcc. + * This array is used only for addresses with IDN. + * @var array + * @access protected + * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc + * @see PHPMailer::$all_recipients + */ + protected $RecipientsQueue = array(); + + /** + * An array of reply-to names and addresses queued for validation. + * In send(), valid and non duplicate entries are moved to $ReplyTo. + * This array is used only for addresses with IDN. + * @var array + * @access protected + * @see PHPMailer::$ReplyTo + */ + protected $ReplyToQueue = array(); + + /** + * The array of attachments. + * @var array + * @access protected + */ + protected $attachment = array(); + + /** + * The array of custom headers. + * @var array + * @access protected + */ + protected $CustomHeader = array(); + + /** + * The most recent Message-ID (including angular brackets). + * @var string + * @access protected + */ + protected $lastMessageID = ''; + + /** + * The message's MIME type. + * @var string + * @access protected + */ + protected $message_type = ''; + + /** + * The array of MIME boundary strings. + * @var array + * @access protected + */ + protected $boundary = array(); + + /** + * The array of available languages. + * @var array + * @access protected + */ + protected $language = array(); + + /** + * The number of errors encountered. + * @var integer + * @access protected + */ + protected $error_count = 0; + + /** + * The S/MIME certificate file path. + * @var string + * @access protected + */ + protected $sign_cert_file = ''; + + /** + * The S/MIME key file path. + * @var string + * @access protected + */ + protected $sign_key_file = ''; + + /** + * The optional S/MIME extra certificates ("CA Chain") file path. + * @var string + * @access protected + */ + protected $sign_extracerts_file = ''; + + /** + * The S/MIME password for the key. + * Used only if the key is encrypted. + * @var string + * @access protected + */ + protected $sign_key_pass = ''; + + /** + * Whether to throw exceptions for errors. + * @var boolean + * @access protected + */ + protected $exceptions = false; + + /** + * Unique ID used for message ID and boundaries. + * @var string + * @access protected + */ + protected $uniqueid = ''; + + /** + * Error severity: message only, continue processing. + */ + const STOP_MESSAGE = 0; + + /** + * Error severity: message, likely ok to continue processing. + */ + const STOP_CONTINUE = 1; + + /** + * Error severity: message, plus full stop, critical error reached. + */ + const STOP_CRITICAL = 2; + + /** + * SMTP RFC standard line ending. + */ + const CRLF = "\r\n"; + + /** + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @var integer + */ + const MAX_LINE_LENGTH = 998; + + /** + * Constructor. + * @param boolean $exceptions Should we throw external exceptions? + */ + public function __construct($exceptions = null) + { + if ($exceptions !== null) { + $this->exceptions = (boolean)$exceptions; + } + } + + /** + * Destructor. + */ + public function __destruct() + { + //Close any open SMTP connection nicely + $this->smtpClose(); + } + + /** + * Call mail() in a safe_mode-aware fashion. + * Also, unless sendmail_path points to sendmail (or something that + * claims to be sendmail), don't pass params (not a perfect fix, + * but it will do) + * @param string $to To + * @param string $subject Subject + * @param string $body Message Body + * @param string $header Additional Header(s) + * @param string $params Params + * @access private + * @return boolean + */ + private function mailPassthru($to, $subject, $body, $header, $params) + { + //Check overloading of mail function to avoid double-encoding + if (ini_get('mbstring.func_overload') & 1) { + $subject = $this->secureHeader($subject); + } else { + $subject = $this->encodeHeader($this->secureHeader($subject)); + } + + //Can't use additional_parameters in safe_mode, calling mail() with null params breaks + //@link http://php.net/manual/en/function.mail.php + if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) { + $result = @mail($to, $subject, $body, $header); + } else { + $result = @mail($to, $subject, $body, $header, $params); + } + return $result; + } + /** + * Output debugging info via user-defined method. + * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug). + * @see PHPMailer::$Debugoutput + * @see PHPMailer::$SMTPDebug + * @param string $str + */ + protected function edebug($str) + { + if ($this->SMTPDebug <= 0) { + return; + } + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { + call_user_func($this->Debugoutput, $str, $this->SMTPDebug); + return; + } + switch ($this->Debugoutput) { + case 'error_log': + //Don't output, just log + error_log($str); + break; + case 'html': + //Cleans up output a bit for a better looking, HTML-safe output + echo htmlentities( + preg_replace('/[\r\n]+/', '', $str), + ENT_QUOTES, + 'UTF-8' + ) + . "
\n"; + break; + case 'echo': + default: + //Normalize line breaks + $str = preg_replace('/\r\n?/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( + "\n", + "\n \t ", + trim($str) + ) . "\n"; + } + } + + /** + * Sets message type to HTML or plain. + * @param boolean $isHtml True for HTML mode. + * @return void + */ + public function isHTML($isHtml = true) + { + if ($isHtml) { + $this->ContentType = 'text/html'; + } else { + $this->ContentType = 'text/plain'; + } + } + + /** + * Send messages using SMTP. + * @return void + */ + public function isSMTP() + { + $this->Mailer = 'smtp'; + } + + /** + * Send messages using PHP's mail() function. + * @return void + */ + public function isMail() + { + $this->Mailer = 'mail'; + } + + /** + * Send messages using $Sendmail. + * @return void + */ + public function isSendmail() + { + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'sendmail')) { + $this->Sendmail = '/usr/sbin/sendmail'; + } else { + $this->Sendmail = $ini_sendmail_path; + } + $this->Mailer = 'sendmail'; + } + + /** + * Send messages using qmail. + * @return void + */ + public function isQmail() + { + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'qmail')) { + $this->Sendmail = '/var/qmail/bin/qmail-inject'; + } else { + $this->Sendmail = $ini_sendmail_path; + } + $this->Mailer = 'qmail'; + } + + /** + * Add a "To" address. + * @param string $address The email address to send to + * @param string $name + * @return boolean true on success, false if address already used or invalid in some way + */ + public function addAddress($address, $name = '') + { + return $this->addOrEnqueueAnAddress('to', $address, $name); + } + + /** + * Add a "CC" address. + * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * @param string $address The email address to send to + * @param string $name + * @return boolean true on success, false if address already used or invalid in some way + */ + public function addCC($address, $name = '') + { + return $this->addOrEnqueueAnAddress('cc', $address, $name); + } + + /** + * Add a "BCC" address. + * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * @param string $address The email address to send to + * @param string $name + * @return boolean true on success, false if address already used or invalid in some way + */ + public function addBCC($address, $name = '') + { + return $this->addOrEnqueueAnAddress('bcc', $address, $name); + } + + /** + * Add a "Reply-To" address. + * @param string $address The email address to reply to + * @param string $name + * @return boolean true on success, false if address already used or invalid in some way + */ + public function addReplyTo($address, $name = '') + { + return $this->addOrEnqueueAnAddress('Reply-To', $address, $name); + } + + /** + * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer + * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still + * be modified after calling this function), addition of such addresses is delayed until send(). + * Addresses that have been added already return false, but do not throw exceptions. + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * @param string $address The email address to send, resp. to reply to + * @param string $name + * @throws phpmailerException + * @return boolean true on success, false if address already used or invalid in some way + * @access protected + */ + protected function addOrEnqueueAnAddress($kind, $address, $name) + { + $address = trim($address); + $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim + if (($pos = strrpos($address, '@')) === false) { + // At-sign is misssing. + $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address"; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + $params = array($kind, $address, $name); + // Enqueue addresses with IDN until we know the PHPMailer::$CharSet. + if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) { + if ($kind != 'Reply-To') { + if (!array_key_exists($address, $this->RecipientsQueue)) { + $this->RecipientsQueue[$address] = $params; + return true; + } + } else { + if (!array_key_exists($address, $this->ReplyToQueue)) { + $this->ReplyToQueue[$address] = $params; + return true; + } + } + return false; + } + // Immediately add standard addresses without IDN. + return call_user_func_array(array($this, 'addAnAddress'), $params); + } + + /** + * Add an address to one of the recipient arrays or to the ReplyTo array. + * Addresses that have been added already return false, but do not throw exceptions. + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * @param string $address The email address to send, resp. to reply to + * @param string $name + * @throws phpmailerException + * @return boolean true on success, false if address already used or invalid in some way + * @access protected + */ + protected function addAnAddress($kind, $address, $name = '') + { + if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) { + $error_message = $this->lang('Invalid recipient kind: ') . $kind; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + if (!$this->validateAddress($address)) { + $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address"; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + if ($kind != 'Reply-To') { + if (!array_key_exists(strtolower($address), $this->all_recipients)) { + array_push($this->$kind, array($address, $name)); + $this->all_recipients[strtolower($address)] = true; + return true; + } + } else { + if (!array_key_exists(strtolower($address), $this->ReplyTo)) { + $this->ReplyTo[strtolower($address)] = array($address, $name); + return true; + } + } + return false; + } + + /** + * Parse and validate a string containing one or more RFC822-style comma-separated email addresses + * of the form "display name
" into an array of name/address pairs. + * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available. + * Note that quotes in the name part are removed. + * @param string $addrstr The address list string + * @param bool $useimap Whether to use the IMAP extension to parse the list + * @return array + * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation + */ + public function parseAddresses($addrstr, $useimap = true) + { + $addresses = array(); + if ($useimap and function_exists('imap_rfc822_parse_adrlist')) { + //Use this built-in parser if it's available + $list = imap_rfc822_parse_adrlist($addrstr, ''); + foreach ($list as $address) { + if ($address->host != '.SYNTAX-ERROR.') { + if ($this->validateAddress($address->mailbox . '@' . $address->host)) { + $addresses[] = array( + 'name' => (property_exists($address, 'personal') ? $address->personal : ''), + 'address' => $address->mailbox . '@' . $address->host + ); + } + } + } + } else { + //Use this simpler parser + $list = explode(',', $addrstr); + foreach ($list as $address) { + $address = trim($address); + //Is there a separate name part? + if (strpos($address, '<') === false) { + //No separate name, just use the whole thing + if ($this->validateAddress($address)) { + $addresses[] = array( + 'name' => '', + 'address' => $address + ); + } + } else { + list($name, $email) = explode('<', $address); + $email = trim(str_replace('>', '', $email)); + if ($this->validateAddress($email)) { + $addresses[] = array( + 'name' => trim(str_replace(array('"', "'"), '', $name)), + 'address' => $email + ); + } + } + } + } + return $addresses; + } + + /** + * Set the From and FromName properties. + * @param string $address + * @param string $name + * @param boolean $auto Whether to also set the Sender address, defaults to true + * @throws phpmailerException + * @return boolean + */ + public function setFrom($address, $name = '', $auto = true) + { + $address = trim($address); + $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim + // Don't validate now addresses with IDN. Will be done in send(). + if (($pos = strrpos($address, '@')) === false or + (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and + !$this->validateAddress($address)) { + $error_message = $this->lang('invalid_address') . " (setFrom) $address"; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + $this->From = $address; + $this->FromName = $name; + if ($auto) { + if (empty($this->Sender)) { + $this->Sender = $address; + } + } + return true; + } + + /** + * Return the Message-ID header of the last email. + * Technically this is the value from the last time the headers were created, + * but it's also the message ID of the last sent message except in + * pathological cases. + * @return string + */ + public function getLastMessageID() + { + return $this->lastMessageID; + } + + /** + * Check that a string looks like an email address. + * @param string $address The email address to check + * @param string|callable $patternselect A selector for the validation pattern to use : + * * `auto` Pick best pattern automatically; + * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14; + * * `pcre` Use old PCRE implementation; + * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; + * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements. + * * `noregex` Don't use a regex: super fast, really dumb. + * Alternatively you may pass in a callable to inject your own validator, for example: + * PHPMailer::validateAddress('user@example.com', function($address) { + * return (strpos($address, '@') !== false); + * }); + * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator. + * @return boolean + * @static + * @access public + */ + public static function validateAddress($address, $patternselect = null) + { + if (is_null($patternselect)) { + $patternselect = self::$validator; + } + if (is_callable($patternselect)) { + return call_user_func($patternselect, $address); + } + //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321 + if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) { + return false; + } + if (!$patternselect or $patternselect == 'auto') { + //Check this constant first so it works when extension_loaded() is disabled by safe mode + //Constant was added in PHP 5.2.4 + if (defined('PCRE_VERSION')) { + //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2 + if (version_compare(PCRE_VERSION, '8.0.3') >= 0) { + $patternselect = 'pcre8'; + } else { + $patternselect = 'pcre'; + } + } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) { + //Fall back to older PCRE + $patternselect = 'pcre'; + } else { + //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension + if (version_compare(PHP_VERSION, '5.2.0') >= 0) { + $patternselect = 'php'; + } else { + $patternselect = 'noregex'; + } + } + } + switch ($patternselect) { + case 'pcre8': + /** + * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains. + * @link http://squiloople.com/2009/12/20/email-address-validation/ + * @copyright 2009-2010 Michael Rushton + * Feel free to use and redistribute this code. But please keep this copyright notice. + */ + return (boolean)preg_match( + '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' . + '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' . + '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' . + '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' . + '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' . + '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' . + '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' . + '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' . + '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', + $address + ); + case 'pcre': + //An older regex that doesn't need a recent PCRE + return (boolean)preg_match( + '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' . + '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' . + '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' . + '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' . + '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' . + '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' . + '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' . + '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' . + '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' . + '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD', + $address + ); + case 'html5': + /** + * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements. + * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) + */ + return (boolean)preg_match( + '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' . + '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD', + $address + ); + case 'noregex': + //No PCRE! Do something _very_ approximate! + //Check the address is 3 chars or longer and contains an @ that's not the first or last char + return (strlen($address) >= 3 + and strpos($address, '@') >= 1 + and strpos($address, '@') != strlen($address) - 1); + case 'php': + default: + return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL); + } + } + + /** + * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the + * "intl" and "mbstring" PHP extensions. + * @return bool "true" if required functions for IDN support are present + */ + public function idnSupported() + { + // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2. + return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding'); + } + + /** + * Converts IDN in given email address to its ASCII form, also known as punycode, if possible. + * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet. + * This function silently returns unmodified address if: + * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form) + * - Conversion to punycode is impossible (e.g. required PHP functions are not available) + * or fails for any reason (e.g. domain has characters not allowed in an IDN) + * @see PHPMailer::$CharSet + * @param string $address The email address to convert + * @return string The encoded address in ASCII form + */ + public function punyencodeAddress($address) + { + // Verify we have required functions, CharSet, and at-sign. + if ($this->idnSupported() and + !empty($this->CharSet) and + ($pos = strrpos($address, '@')) !== false) { + $domain = substr($address, ++$pos); + // Verify CharSet string is a valid one, and domain properly encoded in this CharSet. + if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) { + $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet); + if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ? + idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : + idn_to_ascii($domain)) !== false) { + return substr($address, 0, $pos) . $punycode; + } + } + } + return $address; + } + + /** + * Create a message and send it. + * Uses the sending method specified by $Mailer. + * @throws phpmailerException + * @return boolean false on error - See the ErrorInfo property for details of the error. + */ + public function send() + { + try { + if (!$this->preSend()) { + return false; + } + return $this->postSend(); + } catch (phpmailerException $exc) { + $this->mailHeader = ''; + $this->setError($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + } + + /** + * Prepare a message for sending. + * @throws phpmailerException + * @return boolean + */ + public function preSend() + { + try { + $this->error_count = 0; // Reset errors + $this->mailHeader = ''; + + // Dequeue recipient and Reply-To addresses with IDN + foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) { + $params[1] = $this->punyencodeAddress($params[1]); + call_user_func_array(array($this, 'addAnAddress'), $params); + } + if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { + throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL); + } + + // Validate From, Sender, and ConfirmReadingTo addresses + foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) { + $this->$address_kind = trim($this->$address_kind); + if (empty($this->$address_kind)) { + continue; + } + $this->$address_kind = $this->punyencodeAddress($this->$address_kind); + if (!$this->validateAddress($this->$address_kind)) { + $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind; + $this->setError($error_message); + $this->edebug($error_message); + if ($this->exceptions) { + throw new phpmailerException($error_message); + } + return false; + } + } + + // Set whether the message is multipart/alternative + if ($this->alternativeExists()) { + $this->ContentType = 'multipart/alternative'; + } + + $this->setMessageType(); + // Refuse to send an empty message unless we are specifically allowing it + if (!$this->AllowEmpty and empty($this->Body)) { + throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL); + } + + // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding) + $this->MIMEHeader = ''; + $this->MIMEBody = $this->createBody(); + // createBody may have added some headers, so retain them + $tempheaders = $this->MIMEHeader; + $this->MIMEHeader = $this->createHeader(); + $this->MIMEHeader .= $tempheaders; + + // To capture the complete message when using mail(), create + // an extra header list which createHeader() doesn't fold in + if ($this->Mailer == 'mail') { + if (count($this->to) > 0) { + $this->mailHeader .= $this->addrAppend('To', $this->to); + } else { + $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;'); + } + $this->mailHeader .= $this->headerLine( + 'Subject', + $this->encodeHeader($this->secureHeader(trim($this->Subject))) + ); + } + + // Sign with DKIM if enabled + if (!empty($this->DKIM_domain) + && !empty($this->DKIM_selector) + && (!empty($this->DKIM_private_string) + || (!empty($this->DKIM_private) && file_exists($this->DKIM_private)) + ) + ) { + $header_dkim = $this->DKIM_Add( + $this->MIMEHeader . $this->mailHeader, + $this->encodeHeader($this->secureHeader($this->Subject)), + $this->MIMEBody + ); + $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF . + str_replace("\r\n", "\n", $header_dkim) . self::CRLF; + } + return true; + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + } + + /** + * Actually send a message. + * Send the email via the selected mechanism + * @throws phpmailerException + * @return boolean + */ + public function postSend() + { + try { + // Choose the mailer and send through it + switch ($this->Mailer) { + case 'sendmail': + case 'qmail': + return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody); + case 'smtp': + return $this->smtpSend($this->MIMEHeader, $this->MIMEBody); + case 'mail': + return $this->mailSend($this->MIMEHeader, $this->MIMEBody); + default: + $sendMethod = $this->Mailer.'Send'; + if (method_exists($this, $sendMethod)) { + return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody); + } + + return $this->mailSend($this->MIMEHeader, $this->MIMEBody); + } + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + } + return false; + } + + /** + * Send mail using the $Sendmail program. + * @param string $header The message headers + * @param string $body The message body + * @see PHPMailer::$Sendmail + * @throws phpmailerException + * @access protected + * @return boolean + */ + protected function sendmailSend($header, $body) + { + // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. + if (!empty($this->Sender) and self::isShellSafe($this->Sender)) { + if ($this->Mailer == 'qmail') { + $sendmailFmt = '%s -f%s'; + } else { + $sendmailFmt = '%s -oi -f%s -t'; + } + } else { + if ($this->Mailer == 'qmail') { + $sendmailFmt = '%s'; + } else { + $sendmailFmt = '%s -oi -t'; + } + } + + // TODO: If possible, this should be changed to escapeshellarg. Needs thorough testing. + $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender); + + if ($this->SingleTo) { + foreach ($this->SingleToArray as $toAddr) { + if (!@$mail = popen($sendmail, 'w')) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + fputs($mail, 'To: ' . $toAddr . "\n"); + fputs($mail, $header); + fputs($mail, $body); + $result = pclose($mail); + $this->doCallback( + ($result == 0), + array($toAddr), + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From + ); + if ($result != 0) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + } + } else { + if (!@$mail = popen($sendmail, 'w')) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + fputs($mail, $header); + fputs($mail, $body); + $result = pclose($mail); + $this->doCallback( + ($result == 0), + $this->to, + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From + ); + if ($result != 0) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + } + return true; + } + + /** + * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters. + * + * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows. + * @param string $string The string to be validated + * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report + * @access protected + * @return boolean + */ + protected static function isShellSafe($string) + { + // Future-proof + if (escapeshellcmd($string) !== $string + or !in_array(escapeshellarg($string), array("'$string'", "\"$string\"")) + ) { + return false; + } + + $length = strlen($string); + + for ($i = 0; $i < $length; $i++) { + $c = $string[$i]; + + // All other characters have a special meaning in at least one common shell, including = and +. + // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here. + // Note that this does permit non-Latin alphanumeric characters based on the current locale. + if (!ctype_alnum($c) && strpos('@_-.', $c) === false) { + return false; + } + } + + return true; + } + + /** + * Send mail using the PHP mail() function. + * @param string $header The message headers + * @param string $body The message body + * @link http://www.php.net/manual/en/book.mail.php + * @throws phpmailerException + * @access protected + * @return boolean + */ + protected function mailSend($header, $body) + { + $toArr = array(); + foreach ($this->to as $toaddr) { + $toArr[] = $this->addrFormat($toaddr); + } + $to = implode(', ', $toArr); + + $params = null; + //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver + if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { + // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. + if (self::isShellSafe($this->Sender)) { + $params = sprintf('-f%s', $this->Sender); + } + } + if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) { + $old_from = ini_get('sendmail_from'); + ini_set('sendmail_from', $this->Sender); + } + $result = false; + if ($this->SingleTo and count($toArr) > 1) { + foreach ($toArr as $toAddr) { + $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); + $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From); + } + } else { + $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); + $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + } + if (isset($old_from)) { + ini_set('sendmail_from', $old_from); + } + if (!$result) { + throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL); + } + return true; + } + + /** + * Get an instance to use for SMTP operations. + * Override this function to load your own SMTP implementation + * @return SMTP + */ + public function getSMTPInstance() + { + if (!is_object($this->smtp)) { + $this->smtp = new SMTP; + } + return $this->smtp; + } + + /** + * Send mail via SMTP. + * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. + * Uses the PHPMailerSMTP class by default. + * @see PHPMailer::getSMTPInstance() to use a different class. + * @param string $header The message headers + * @param string $body The message body + * @throws phpmailerException + * @uses SMTP + * @access protected + * @return boolean + */ + protected function smtpSend($header, $body) + { + $bad_rcpt = array(); + if (!$this->smtpConnect($this->SMTPOptions)) { + throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); + } + if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { + $smtp_from = $this->Sender; + } else { + $smtp_from = $this->From; + } + if (!$this->smtp->mail($smtp_from)) { + $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError())); + throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); + } + + // Attempt to send to all recipients + foreach (array($this->to, $this->cc, $this->bcc) as $togroup) { + foreach ($togroup as $to) { + if (!$this->smtp->recipient($to[0])) { + $error = $this->smtp->getError(); + $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']); + $isSent = false; + } else { + $isSent = true; + } + $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); + } + } + + // Only send the DATA command if we have viable recipients + if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) { + throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL); + } + if ($this->SMTPKeepAlive) { + $this->smtp->reset(); + } else { + $this->smtp->quit(); + $this->smtp->close(); + } + //Create error message for any bad addresses + if (count($bad_rcpt) > 0) { + $errstr = ''; + foreach ($bad_rcpt as $bad) { + $errstr .= $bad['to'] . ': ' . $bad['error']; + } + throw new phpmailerException( + $this->lang('recipients_failed') . $errstr, + self::STOP_CONTINUE + ); + } + return true; + } + + /** + * Initiate a connection to an SMTP server. + * Returns false if the operation failed. + * @param array $options An array of options compatible with stream_context_create() + * @uses SMTP + * @access public + * @throws phpmailerException + * @return boolean + */ + public function smtpConnect($options = null) + { + if (is_null($this->smtp)) { + $this->smtp = $this->getSMTPInstance(); + } + + //If no options are provided, use whatever is set in the instance + if (is_null($options)) { + $options = $this->SMTPOptions; + } + + // Already connected? + if ($this->smtp->connected()) { + return true; + } + + $this->smtp->setTimeout($this->Timeout); + $this->smtp->setDebugLevel($this->SMTPDebug); + $this->smtp->setDebugOutput($this->Debugoutput); + $this->smtp->setVerp($this->do_verp); + $hosts = explode(';', $this->Host); + $lastexception = null; + + foreach ($hosts as $hostentry) { + $hostinfo = array(); + if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { + // Not a valid host entry + continue; + } + // $hostinfo[2]: optional ssl or tls prefix + // $hostinfo[3]: the hostname + // $hostinfo[4]: optional port number + // The host string prefix can temporarily override the current setting for SMTPSecure + // If it's not specified, the default value is used + $prefix = ''; + $secure = $this->SMTPSecure; + $tls = ($this->SMTPSecure == 'tls'); + if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) { + $prefix = 'ssl://'; + $tls = false; // Can't have SSL and TLS at the same time + $secure = 'ssl'; + } elseif ($hostinfo[2] == 'tls') { + $tls = true; + // tls doesn't use a prefix + $secure = 'tls'; + } + //Do we need the OpenSSL extension? + $sslext = defined('OPENSSL_ALGO_SHA1'); + if ('tls' === $secure or 'ssl' === $secure) { + //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled + if (!$sslext) { + throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL); + } + } + $host = $hostinfo[3]; + $port = $this->Port; + $tport = (integer)$hostinfo[4]; + if ($tport > 0 and $tport < 65536) { + $port = $tport; + } + if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) { + try { + if ($this->Helo) { + $hello = $this->Helo; + } else { + $hello = $this->serverHostname(); + } + $this->smtp->hello($hello); + //Automatically enable TLS encryption if: + // * it's not disabled + // * we have openssl extension + // * we are not already using SSL + // * the server offers STARTTLS + if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) { + $tls = true; + } + if ($tls) { + if (!$this->smtp->startTLS()) { + throw new phpmailerException($this->lang('connect_host')); + } + // We must resend EHLO after TLS negotiation + $this->smtp->hello($hello); + } + if ($this->SMTPAuth) { + if (!$this->smtp->authenticate( + $this->Username, + $this->Password, + $this->AuthType, + $this->Realm, + $this->Workstation + ) + ) { + throw new phpmailerException($this->lang('authenticate')); + } + } + return true; + } catch (phpmailerException $exc) { + $lastexception = $exc; + $this->edebug($exc->getMessage()); + // We must have connected, but then failed TLS or Auth, so close connection nicely + $this->smtp->quit(); + } + } + } + // If we get here, all connection attempts have failed, so close connection hard + $this->smtp->close(); + // As we've caught all exceptions, just report whatever the last one was + if ($this->exceptions and !is_null($lastexception)) { + throw $lastexception; + } + return false; + } + + /** + * Close the active SMTP session if one exists. + * @return void + */ + public function smtpClose() + { + if (is_a($this->smtp, 'SMTP')) { + if ($this->smtp->connected()) { + $this->smtp->quit(); + $this->smtp->close(); + } + } + } + + /** + * Set the language for error messages. + * Returns false if it cannot load the language file. + * The default language is English. + * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") + * @param string $lang_path Path to the language file directory, with trailing separator (slash) + * @return boolean + * @access public + */ + public function setLanguage($langcode = 'en', $lang_path = '') + { + // Backwards compatibility for renamed language codes + $renamed_langcodes = array( + 'br' => 'pt_br', + 'cz' => 'cs', + 'dk' => 'da', + 'no' => 'nb', + 'se' => 'sv', + ); + + if (isset($renamed_langcodes[$langcode])) { + $langcode = $renamed_langcodes[$langcode]; + } + + // Define full set of translatable strings in English + $PHPMAILER_LANG = array( + 'authenticate' => 'SMTP Error: Could not authenticate.', + 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', + 'data_not_accepted' => 'SMTP Error: data not accepted.', + 'empty_message' => 'Message body empty', + 'encoding' => 'Unknown encoding: ', + 'execute' => 'Could not execute: ', + 'file_access' => 'Could not access file: ', + 'file_open' => 'File Error: Could not open file: ', + 'from_failed' => 'The following From address failed: ', + 'instantiate' => 'Could not instantiate mail function.', + 'invalid_address' => 'Invalid address: ', + 'mailer_not_supported' => ' mailer is not supported.', + 'provide_address' => 'You must provide at least one recipient email address.', + 'recipients_failed' => 'SMTP Error: The following recipients failed: ', + 'signing' => 'Signing Error: ', + 'smtp_connect_failed' => 'SMTP connect() failed.', + 'smtp_error' => 'SMTP server error: ', + 'variable_set' => 'Cannot set or reset variable: ', + 'extension_missing' => 'Extension missing: ' + ); + if (empty($lang_path)) { + // Calculate an absolute path so it can work if CWD is not here + $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR; + } + //Validate $langcode + if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) { + $langcode = 'en'; + } + $foundlang = true; + $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php'; + // There is no English translation file + if ($langcode != 'en') { + // Make sure language file path is readable + if (!is_readable($lang_file)) { + $foundlang = false; + } else { + // Overwrite language-specific strings. + // This way we'll never have missing translation keys. + $foundlang = include $lang_file; + } + } + $this->language = $PHPMAILER_LANG; + return (boolean)$foundlang; // Returns false if language not found + } + + /** + * Get the array of strings for the current language. + * @return array + */ + public function getTranslations() + { + return $this->language; + } + + /** + * Create recipient headers. + * @access public + * @param string $type + * @param array $addr An array of recipient, + * where each recipient is a 2-element indexed array with element 0 containing an address + * and element 1 containing a name, like: + * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User')) + * @return string + */ + public function addrAppend($type, $addr) + { + $addresses = array(); + foreach ($addr as $address) { + $addresses[] = $this->addrFormat($address); + } + return $type . ': ' . implode(', ', $addresses) . $this->LE; + } + + /** + * Format an address for use in a message header. + * @access public + * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name + * like array('joe@example.com', 'Joe User') + * @return string + */ + public function addrFormat($addr) + { + if (empty($addr[1])) { // No name provided + return $this->secureHeader($addr[0]); + } else { + return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader( + $addr[0] + ) . '>'; + } + } + + /** + * Word-wrap message. + * For use with mailers that do not automatically perform wrapping + * and for quoted-printable encoded messages. + * Original written by philippe. + * @param string $message The message to wrap + * @param integer $length The line length to wrap to + * @param boolean $qp_mode Whether to run in Quoted-Printable mode + * @access public + * @return string + */ + public function wrapText($message, $length, $qp_mode = false) + { + if ($qp_mode) { + $soft_break = sprintf(' =%s', $this->LE); + } else { + $soft_break = $this->LE; + } + // If utf-8 encoding is used, we will need to make sure we don't + // split multibyte characters when we wrap + $is_utf8 = (strtolower($this->CharSet) == 'utf-8'); + $lelen = strlen($this->LE); + $crlflen = strlen(self::CRLF); + + $message = $this->fixEOL($message); + //Remove a trailing line break + if (substr($message, -$lelen) == $this->LE) { + $message = substr($message, 0, -$lelen); + } + + //Split message into lines + $lines = explode($this->LE, $message); + //Message will be rebuilt in here + $message = ''; + foreach ($lines as $line) { + $words = explode(' ', $line); + $buf = ''; + $firstword = true; + foreach ($words as $word) { + if ($qp_mode and (strlen($word) > $length)) { + $space_left = $length - strlen($buf) - $crlflen; + if (!$firstword) { + if ($space_left > 20) { + $len = $space_left; + if ($is_utf8) { + $len = $this->utf8CharBoundary($word, $len); + } elseif (substr($word, $len - 1, 1) == '=') { + $len--; + } elseif (substr($word, $len - 2, 1) == '=') { + $len -= 2; + } + $part = substr($word, 0, $len); + $word = substr($word, $len); + $buf .= ' ' . $part; + $message .= $buf . sprintf('=%s', self::CRLF); + } else { + $message .= $buf . $soft_break; + } + $buf = ''; + } + while (strlen($word) > 0) { + if ($length <= 0) { + break; + } + $len = $length; + if ($is_utf8) { + $len = $this->utf8CharBoundary($word, $len); + } elseif (substr($word, $len - 1, 1) == '=') { + $len--; + } elseif (substr($word, $len - 2, 1) == '=') { + $len -= 2; + } + $part = substr($word, 0, $len); + $word = substr($word, $len); + + if (strlen($word) > 0) { + $message .= $part . sprintf('=%s', self::CRLF); + } else { + $buf = $part; + } + } + } else { + $buf_o = $buf; + if (!$firstword) { + $buf .= ' '; + } + $buf .= $word; + + if (strlen($buf) > $length and $buf_o != '') { + $message .= $buf_o . $soft_break; + $buf = $word; + } + } + $firstword = false; + } + $message .= $buf . self::CRLF; + } + + return $message; + } + + /** + * Find the last character boundary prior to $maxLength in a utf-8 + * quoted-printable encoded string. + * Original written by Colin Brown. + * @access public + * @param string $encodedText utf-8 QP text + * @param integer $maxLength Find the last character boundary prior to this length + * @return integer + */ + public function utf8CharBoundary($encodedText, $maxLength) + { + $foundSplitPos = false; + $lookBack = 3; + while (!$foundSplitPos) { + $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); + $encodedCharPos = strpos($lastChunk, '='); + if (false !== $encodedCharPos) { + // Found start of encoded character byte within $lookBack block. + // Check the encoded byte value (the 2 chars after the '=') + $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); + $dec = hexdec($hex); + if ($dec < 128) { + // Single byte character. + // If the encoded char was found at pos 0, it will fit + // otherwise reduce maxLength to start of the encoded char + if ($encodedCharPos > 0) { + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + } + $foundSplitPos = true; + } elseif ($dec >= 192) { + // First byte of a multi byte character + // Reduce maxLength to split at start of character + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + $foundSplitPos = true; + } elseif ($dec < 192) { + // Middle byte of a multi byte character, look further back + $lookBack += 3; + } + } else { + // No encoded character found + $foundSplitPos = true; + } + } + return $maxLength; + } + + /** + * Apply word wrapping to the message body. + * Wraps the message body to the number of chars set in the WordWrap property. + * You should only do this to plain-text bodies as wrapping HTML tags may break them. + * This is called automatically by createBody(), so you don't need to call it yourself. + * @access public + * @return void + */ + public function setWordWrap() + { + if ($this->WordWrap < 1) { + return; + } + + switch ($this->message_type) { + case 'alt': + case 'alt_inline': + case 'alt_attach': + case 'alt_inline_attach': + $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap); + break; + default: + $this->Body = $this->wrapText($this->Body, $this->WordWrap); + break; + } + } + + /** + * Assemble message headers. + * @access public + * @return string The assembled headers + */ + public function createHeader() + { + $result = ''; + + if ($this->MessageDate == '') { + $this->MessageDate = self::rfcDate(); + } + $result .= $this->headerLine('Date', $this->MessageDate); + + // To be created automatically by mail() + if ($this->SingleTo) { + if ($this->Mailer != 'mail') { + foreach ($this->to as $toaddr) { + $this->SingleToArray[] = $this->addrFormat($toaddr); + } + } + } else { + if (count($this->to) > 0) { + if ($this->Mailer != 'mail') { + $result .= $this->addrAppend('To', $this->to); + } + } elseif (count($this->cc) == 0) { + $result .= $this->headerLine('To', 'undisclosed-recipients:;'); + } + } + + $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName))); + + // sendmail and mail() extract Cc from the header before sending + if (count($this->cc) > 0) { + $result .= $this->addrAppend('Cc', $this->cc); + } + + // sendmail and mail() extract Bcc from the header before sending + if (( + $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail' + ) + and count($this->bcc) > 0 + ) { + $result .= $this->addrAppend('Bcc', $this->bcc); + } + + if (count($this->ReplyTo) > 0) { + $result .= $this->addrAppend('Reply-To', $this->ReplyTo); + } + + // mail() sets the subject itself + if ($this->Mailer != 'mail') { + $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject))); + } + + // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4 + // https://tools.ietf.org/html/rfc5322#section-3.6.4 + if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) { + $this->lastMessageID = $this->MessageID; + } else { + $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname()); + } + $result .= $this->headerLine('Message-ID', $this->lastMessageID); + if (!is_null($this->Priority)) { + $result .= $this->headerLine('X-Priority', $this->Priority); + } + if ($this->XMailer == '') { + $result .= $this->headerLine( + 'X-Mailer', + 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)' + ); + } else { + $myXmailer = trim($this->XMailer); + if ($myXmailer) { + $result .= $this->headerLine('X-Mailer', $myXmailer); + } + } + + if ($this->ConfirmReadingTo != '') { + $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>'); + } + + // Add custom headers + foreach ($this->CustomHeader as $header) { + $result .= $this->headerLine( + trim($header[0]), + $this->encodeHeader(trim($header[1])) + ); + } + if (!$this->sign_key_file) { + $result .= $this->headerLine('MIME-Version', '1.0'); + $result .= $this->getMailMIME(); + } + + return $result; + } + + /** + * Get the message MIME type headers. + * @access public + * @return string + */ + public function getMailMIME() + { + $result = ''; + $ismultipart = true; + switch ($this->message_type) { + case 'inline': + $result .= $this->headerLine('Content-Type', 'multipart/related;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + case 'attach': + case 'inline_attach': + case 'alt_attach': + case 'alt_inline_attach': + $result .= $this->headerLine('Content-Type', 'multipart/mixed;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + case 'alt': + case 'alt_inline': + $result .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + default: + // Catches case 'plain': and case '': + $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet); + $ismultipart = false; + break; + } + // RFC1341 part 5 says 7bit is assumed if not specified + if ($this->Encoding != '7bit') { + // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE + if ($ismultipart) { + if ($this->Encoding == '8bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', '8bit'); + } + // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible + } else { + $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding); + } + } + + if ($this->Mailer != 'mail') { + $result .= $this->LE; + } + + return $result; + } + + /** + * Returns the whole MIME message. + * Includes complete headers and body. + * Only valid post preSend(). + * @see PHPMailer::preSend() + * @access public + * @return string + */ + public function getSentMIMEMessage() + { + return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody; + } + + /** + * Create unique ID + * @return string + */ + protected function generateId() { + return md5(uniqid(time())); + } + + /** + * Assemble the message body. + * Returns an empty string on failure. + * @access public + * @throws phpmailerException + * @return string The assembled message body + */ + public function createBody() + { + $body = ''; + //Create unique IDs and preset boundaries + $this->uniqueid = $this->generateId(); + $this->boundary[1] = 'b1_' . $this->uniqueid; + $this->boundary[2] = 'b2_' . $this->uniqueid; + $this->boundary[3] = 'b3_' . $this->uniqueid; + + if ($this->sign_key_file) { + $body .= $this->getMailMIME() . $this->LE; + } + + $this->setWordWrap(); + + $bodyEncoding = $this->Encoding; + $bodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) { + $bodyEncoding = '7bit'; + //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit + $bodyCharSet = 'us-ascii'; + } + //If lines are too long, and we're not already using an encoding that will shorten them, + //change to quoted-printable transfer encoding for the body part only + if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) { + $bodyEncoding = 'quoted-printable'; + } + + $altBodyEncoding = $this->Encoding; + $altBodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) { + $altBodyEncoding = '7bit'; + //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit + $altBodyCharSet = 'us-ascii'; + } + //If lines are too long, and we're not already using an encoding that will shorten them, + //change to quoted-printable transfer encoding for the alt body part only + if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) { + $altBodyEncoding = 'quoted-printable'; + } + //Use this as a preamble in all multipart message types + $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; + switch ($this->message_type) { + case 'inline': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[1]); + break; + case 'attach': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'inline_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'alt': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + if (!empty($this->Ical)) { + $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', ''); + $body .= $this->encodeString($this->Ical, $this->Encoding); + $body .= $this->LE . $this->LE; + } + $body .= $this->endBoundary($this->boundary[1]); + break; + case 'alt_inline': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[2]); + $body .= $this->LE; + $body .= $this->endBoundary($this->boundary[1]); + break; + case 'alt_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->endBoundary($this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'alt_inline_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->textLine('--' . $this->boundary[2]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[3]); + $body .= $this->LE; + $body .= $this->endBoundary($this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + default: + // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types + //Reset the `Encoding` property in case we changed it for line length reasons + $this->Encoding = $bodyEncoding; + $body .= $this->encodeString($this->Body, $this->Encoding); + break; + } + + if ($this->isError()) { + $body = ''; + } elseif ($this->sign_key_file) { + try { + if (!defined('PKCS7_TEXT')) { + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); + } + // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1 + $file = tempnam(sys_get_temp_dir(), 'mail'); + if (false === file_put_contents($file, $body)) { + throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); + } + $signed = tempnam(sys_get_temp_dir(), 'signed'); + //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 + if (empty($this->sign_extracerts_file)) { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null + ); + } else { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null, + PKCS7_DETACHED, + $this->sign_extracerts_file + ); + } + if ($sign) { + @unlink($file); + $body = file_get_contents($signed); + @unlink($signed); + //The message returned by openssl contains both headers and body, so need to split them up + $parts = explode("\n\n", $body, 2); + $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE; + $body = $parts[1]; + } else { + @unlink($file); + @unlink($signed); + throw new phpmailerException($this->lang('signing') . openssl_error_string()); + } + } catch (phpmailerException $exc) { + $body = ''; + if ($this->exceptions) { + throw $exc; + } + } + } + return $body; + } + + /** + * Return the start of a message boundary. + * @access protected + * @param string $boundary + * @param string $charSet + * @param string $contentType + * @param string $encoding + * @return string + */ + protected function getBoundary($boundary, $charSet, $contentType, $encoding) + { + $result = ''; + if ($charSet == '') { + $charSet = $this->CharSet; + } + if ($contentType == '') { + $contentType = $this->ContentType; + } + if ($encoding == '') { + $encoding = $this->Encoding; + } + $result .= $this->textLine('--' . $boundary); + $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet); + $result .= $this->LE; + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', $encoding); + } + $result .= $this->LE; + + return $result; + } + + /** + * Return the end of a message boundary. + * @access protected + * @param string $boundary + * @return string + */ + protected function endBoundary($boundary) + { + return $this->LE . '--' . $boundary . '--' . $this->LE; + } + + /** + * Set the message type. + * PHPMailer only supports some preset message types, not arbitrary MIME structures. + * @access protected + * @return void + */ + protected function setMessageType() + { + $type = array(); + if ($this->alternativeExists()) { + $type[] = 'alt'; + } + if ($this->inlineImageExists()) { + $type[] = 'inline'; + } + if ($this->attachmentExists()) { + $type[] = 'attach'; + } + $this->message_type = implode('_', $type); + if ($this->message_type == '') { + //The 'plain' message_type refers to the message having a single body element, not that it is plain-text + $this->message_type = 'plain'; + } + } + + /** + * Format a header line. + * @access public + * @param string $name + * @param string $value + * @return string + */ + public function headerLine($name, $value) + { + return $name . ': ' . $value . $this->LE; + } + + /** + * Return a formatted mail line. + * @access public + * @param string $value + * @return string + */ + public function textLine($value) + { + return $value . $this->LE; + } + + /** + * Add an attachment from a path on the filesystem. + * Returns false if the file could not be found or read. + * @param string $path Path to the attachment. + * @param string $name Overrides the attachment name. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File extension (MIME) type. + * @param string $disposition Disposition to use + * @throws phpmailerException + * @return boolean + */ + public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment') + { + try { + if (!@is_file($path)) { + throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE); + } + + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($path); + } + + $filename = basename($path); + if ($name == '') { + $name = $filename; + } + + $this->attachment[] = array( + 0 => $path, + 1 => $filename, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => false, // isStringAttachment + 6 => $disposition, + 7 => 0 + ); + + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + return true; + } + + /** + * Return the array of attachments. + * @return array + */ + public function getAttachments() + { + return $this->attachment; + } + + /** + * Attach all file, string, and binary attachments to the message. + * Returns an empty string on failure. + * @access protected + * @param string $disposition_type + * @param string $boundary + * @return string + */ + protected function attachAll($disposition_type, $boundary) + { + // Return text of body + $mime = array(); + $cidUniq = array(); + $incl = array(); + + // Add all attachments + foreach ($this->attachment as $attachment) { + // Check if it is a valid disposition_filter + if ($attachment[6] == $disposition_type) { + // Check for string attachment + $string = ''; + $path = ''; + $bString = $attachment[5]; + if ($bString) { + $string = $attachment[0]; + } else { + $path = $attachment[0]; + } + + $inclhash = md5(serialize($attachment)); + if (in_array($inclhash, $incl)) { + continue; + } + $incl[] = $inclhash; + $name = $attachment[2]; + $encoding = $attachment[3]; + $type = $attachment[4]; + $disposition = $attachment[6]; + $cid = $attachment[7]; + if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) { + continue; + } + $cidUniq[$cid] = true; + + $mime[] = sprintf('--%s%s', $boundary, $this->LE); + //Only include a filename property if we have one + if (!empty($name)) { + $mime[] = sprintf( + 'Content-Type: %s; name="%s"%s', + $type, + $this->encodeHeader($this->secureHeader($name)), + $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Type: %s%s', + $type, + $this->LE + ); + } + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE); + } + + if ($disposition == 'inline') { + $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE); + } + + // If a filename contains any of these chars, it should be quoted, + // but not otherwise: RFC2183 & RFC2045 5.1 + // Fixes a warning in IETF's msglint MIME checker + // Allow for bypassing the Content-Disposition header totally + if (!(empty($disposition))) { + $encoded_name = $this->encodeHeader($this->secureHeader($name)); + if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) { + $mime[] = sprintf( + 'Content-Disposition: %s; filename="%s"%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } else { + if (!empty($encoded_name)) { + $mime[] = sprintf( + 'Content-Disposition: %s; filename=%s%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Disposition: %s%s', + $disposition, + $this->LE . $this->LE + ); + } + } + } else { + $mime[] = $this->LE; + } + + // Encode as string attachment + if ($bString) { + $mime[] = $this->encodeString($string, $encoding); + if ($this->isError()) { + return ''; + } + $mime[] = $this->LE . $this->LE; + } else { + $mime[] = $this->encodeFile($path, $encoding); + if ($this->isError()) { + return ''; + } + $mime[] = $this->LE . $this->LE; + } + } + } + + $mime[] = sprintf('--%s--%s', $boundary, $this->LE); + + return implode('', $mime); + } + + /** + * Encode a file attachment in requested format. + * Returns an empty string on failure. + * @param string $path The full path to the file + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' + * @throws phpmailerException + * @access protected + * @return string + */ + protected function encodeFile($path, $encoding = 'base64') + { + try { + if (!is_readable($path)) { + throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE); + } + $magic_quotes = get_magic_quotes_runtime(); + if ($magic_quotes) { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + set_magic_quotes_runtime(false); + } else { + //Doesn't exist in PHP 5.4, but we don't need to check because + //get_magic_quotes_runtime always returns false in 5.4+ + //so it will never get here + ini_set('magic_quotes_runtime', false); + } + } + $file_buffer = file_get_contents($path); + $file_buffer = $this->encodeString($file_buffer, $encoding); + if ($magic_quotes) { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + set_magic_quotes_runtime($magic_quotes); + } else { + ini_set('magic_quotes_runtime', $magic_quotes); + } + } + return $file_buffer; + } catch (Exception $exc) { + $this->setError($exc->getMessage()); + return ''; + } + } + + /** + * Encode a string in requested format. + * Returns an empty string on failure. + * @param string $str The text to encode + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' + * @access public + * @return string + */ + public function encodeString($str, $encoding = 'base64') + { + $encoded = ''; + switch (strtolower($encoding)) { + case 'base64': + $encoded = chunk_split(base64_encode($str), 76, $this->LE); + break; + case '7bit': + case '8bit': + $encoded = $this->fixEOL($str); + // Make sure it ends with a line break + if (substr($encoded, -(strlen($this->LE))) != $this->LE) { + $encoded .= $this->LE; + } + break; + case 'binary': + $encoded = $str; + break; + case 'quoted-printable': + $encoded = $this->encodeQP($str); + break; + default: + $this->setError($this->lang('encoding') . $encoding); + break; + } + return $encoded; + } + + /** + * Encode a header string optimally. + * Picks shortest of Q, B, quoted-printable or none. + * @access public + * @param string $str + * @param string $position + * @return string + */ + public function encodeHeader($str, $position = 'text') + { + $matchcount = 0; + switch (strtolower($position)) { + case 'phrase': + if (!preg_match('/[\200-\377]/', $str)) { + // Can't use addslashes as we don't know the value of magic_quotes_sybase + $encoded = addcslashes($str, "\0..\37\177\\\""); + if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { + return ($encoded); + } else { + return ("\"$encoded\""); + } + } + $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); + break; + /** @noinspection PhpMissingBreakStatementInspection */ + case 'comment': + $matchcount = preg_match_all('/[()"]/', $str, $matches); + // Intentional fall-through + case 'text': + default: + $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); + break; + } + + //There are no chars that need encoding + if ($matchcount == 0) { + return ($str); + } + + $maxlen = 75 - 7 - strlen($this->CharSet); + // Try to select the encoding which should produce the shortest output + if ($matchcount > strlen($str) / 3) { + // More than a third of the content will need encoding, so B encoding will be most efficient + $encoding = 'B'; + if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) { + // Use a custom function which correctly encodes and wraps long + // multibyte strings without breaking lines within a character + $encoded = $this->base64EncodeWrapMB($str, "\n"); + } else { + $encoded = base64_encode($str); + $maxlen -= $maxlen % 4; + $encoded = trim(chunk_split($encoded, $maxlen, "\n")); + } + } else { + $encoding = 'Q'; + $encoded = $this->encodeQ($str, $position); + $encoded = $this->wrapText($encoded, $maxlen, true); + $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded)); + } + + $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded); + $encoded = trim(str_replace("\n", $this->LE, $encoded)); + + return $encoded; + } + + /** + * Check if a string contains multi-byte characters. + * @access public + * @param string $str multi-byte text to wrap encode + * @return boolean + */ + public function hasMultiBytes($str) + { + if (function_exists('mb_strlen')) { + return (strlen($str) > mb_strlen($str, $this->CharSet)); + } else { // Assume no multibytes (we can't handle without mbstring functions anyway) + return false; + } + } + + /** + * Does a string contain any 8-bit chars (in any charset)? + * @param string $text + * @return boolean + */ + public function has8bitChars($text) + { + return (boolean)preg_match('/[\x80-\xFF]/', $text); + } + + /** + * Encode and wrap long multibyte strings for mail headers + * without breaking lines within a character. + * Adapted from a function by paravoid + * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283 + * @access public + * @param string $str multi-byte text to wrap encode + * @param string $linebreak string to use as linefeed/end-of-line + * @return string + */ + public function base64EncodeWrapMB($str, $linebreak = null) + { + $start = '=?' . $this->CharSet . '?B?'; + $end = '?='; + $encoded = ''; + if ($linebreak === null) { + $linebreak = $this->LE; + } + + $mb_length = mb_strlen($str, $this->CharSet); + // Each line must have length <= 75, including $start and $end + $length = 75 - strlen($start) - strlen($end); + // Average multi-byte ratio + $ratio = $mb_length / strlen($str); + // Base64 has a 4:3 ratio + $avgLength = floor($length * $ratio * .75); + + for ($i = 0; $i < $mb_length; $i += $offset) { + $lookBack = 0; + do { + $offset = $avgLength - $lookBack; + $chunk = mb_substr($str, $i, $offset, $this->CharSet); + $chunk = base64_encode($chunk); + $lookBack++; + } while (strlen($chunk) > $length); + $encoded .= $chunk . $linebreak; + } + + // Chomp the last linefeed + $encoded = substr($encoded, 0, -strlen($linebreak)); + return $encoded; + } + + /** + * Encode a string in quoted-printable format. + * According to RFC2045 section 6.7. + * @access public + * @param string $string The text to encode + * @param integer $line_max Number of chars allowed on a line before wrapping + * @return string + * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment + */ + public function encodeQP($string, $line_max = 76) + { + // Use native function if it's available (>= PHP5.3) + if (function_exists('quoted_printable_encode')) { + return quoted_printable_encode($string); + } + // Fall back to a pure PHP implementation + $string = str_replace( + array('%20', '%0D%0A.', '%0D%0A', '%'), + array(' ', "\r\n=2E", "\r\n", '='), + rawurlencode($string) + ); + return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); + } + + /** + * Backward compatibility wrapper for an old QP encoding function that was removed. + * @see PHPMailer::encodeQP() + * @access public + * @param string $string + * @param integer $line_max + * @param boolean $space_conv + * @return string + * @deprecated Use encodeQP instead. + */ + public function encodeQPphp( + $string, + $line_max = 76, + /** @noinspection PhpUnusedParameterInspection */ $space_conv = false + ) { + return $this->encodeQP($string, $line_max); + } + + /** + * Encode a string using Q encoding. + * @link http://tools.ietf.org/html/rfc2047 + * @param string $str the text to encode + * @param string $position Where the text is going to be used, see the RFC for what that means + * @access public + * @return string + */ + public function encodeQ($str, $position = 'text') + { + // There should not be any EOL in the string + $pattern = ''; + $encoded = str_replace(array("\r", "\n"), '', $str); + switch (strtolower($position)) { + case 'phrase': + // RFC 2047 section 5.3 + $pattern = '^A-Za-z0-9!*+\/ -'; + break; + /** @noinspection PhpMissingBreakStatementInspection */ + case 'comment': + // RFC 2047 section 5.2 + $pattern = '\(\)"'; + // intentional fall-through + // for this reason we build the $pattern without including delimiters and [] + case 'text': + default: + // RFC 2047 section 5.1 + // Replace every high ascii, control, =, ? and _ characters + $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern; + break; + } + $matches = array(); + if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) { + // If the string contains an '=', make sure it's the first thing we replace + // so as to avoid double-encoding + $eqkey = array_search('=', $matches[0]); + if (false !== $eqkey) { + unset($matches[0][$eqkey]); + array_unshift($matches[0], '='); + } + foreach (array_unique($matches[0]) as $char) { + $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded); + } + } + // Replace every spaces to _ (more readable than =20) + return str_replace(' ', '_', $encoded); + } + + /** + * Add a string or binary attachment (non-filesystem). + * This method can be used to attach ascii or binary data, + * such as a BLOB record from a database. + * @param string $string String attachment data. + * @param string $filename Name of the attachment. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File extension (MIME) type. + * @param string $disposition Disposition to use + * @return void + */ + public function addStringAttachment( + $string, + $filename, + $encoding = 'base64', + $type = '', + $disposition = 'attachment' + ) { + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($filename); + } + // Append to $attachment array + $this->attachment[] = array( + 0 => $string, + 1 => $filename, + 2 => basename($filename), + 3 => $encoding, + 4 => $type, + 5 => true, // isStringAttachment + 6 => $disposition, + 7 => 0 + ); + } + + /** + * Add an embedded (inline) attachment from a file. + * This can include images, sounds, and just about any other document type. + * These differ from 'regular' attachments in that they are intended to be + * displayed inline with the message, not just attached for download. + * This is used in HTML messages that embed the images + * the HTML refers to using the $cid value. + * @param string $path Path to the attachment. + * @param string $cid Content ID of the attachment; Use this to reference + * the content when using an embedded image in HTML. + * @param string $name Overrides the attachment name. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File MIME type. + * @param string $disposition Disposition to use + * @return boolean True on successfully adding an attachment + */ + public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline') + { + if (!@is_file($path)) { + $this->setError($this->lang('file_access') . $path); + return false; + } + + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($path); + } + + $filename = basename($path); + if ($name == '') { + $name = $filename; + } + + // Append to $attachment array + $this->attachment[] = array( + 0 => $path, + 1 => $filename, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => false, // isStringAttachment + 6 => $disposition, + 7 => $cid + ); + return true; + } + + /** + * Add an embedded stringified attachment. + * This can include images, sounds, and just about any other document type. + * Be sure to set the $type to an image type for images: + * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'. + * @param string $string The attachment binary data. + * @param string $cid Content ID of the attachment; Use this to reference + * the content when using an embedded image in HTML. + * @param string $name + * @param string $encoding File encoding (see $Encoding). + * @param string $type MIME type. + * @param string $disposition Disposition to use + * @return boolean True on successfully adding an attachment + */ + public function addStringEmbeddedImage( + $string, + $cid, + $name = '', + $encoding = 'base64', + $type = '', + $disposition = 'inline' + ) { + // If a MIME type is not specified, try to work it out from the name + if ($type == '' and !empty($name)) { + $type = self::filenameToType($name); + } + + // Append to $attachment array + $this->attachment[] = array( + 0 => $string, + 1 => $name, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => true, // isStringAttachment + 6 => $disposition, + 7 => $cid + ); + return true; + } + + /** + * Check if an inline attachment is present. + * @access public + * @return boolean + */ + public function inlineImageExists() + { + foreach ($this->attachment as $attachment) { + if ($attachment[6] == 'inline') { + return true; + } + } + return false; + } + + /** + * Check if an attachment (non-inline) is present. + * @return boolean + */ + public function attachmentExists() + { + foreach ($this->attachment as $attachment) { + if ($attachment[6] == 'attachment') { + return true; + } + } + return false; + } + + /** + * Check if this message has an alternative body set. + * @return boolean + */ + public function alternativeExists() + { + return !empty($this->AltBody); + } + + /** + * Clear queued addresses of given kind. + * @access protected + * @param string $kind 'to', 'cc', or 'bcc' + * @return void + */ + public function clearQueuedAddresses($kind) + { + $RecipientsQueue = $this->RecipientsQueue; + foreach ($RecipientsQueue as $address => $params) { + if ($params[0] == $kind) { + unset($this->RecipientsQueue[$address]); + } + } + } + + /** + * Clear all To recipients. + * @return void + */ + public function clearAddresses() + { + foreach ($this->to as $to) { + unset($this->all_recipients[strtolower($to[0])]); + } + $this->to = array(); + $this->clearQueuedAddresses('to'); + } + + /** + * Clear all CC recipients. + * @return void + */ + public function clearCCs() + { + foreach ($this->cc as $cc) { + unset($this->all_recipients[strtolower($cc[0])]); + } + $this->cc = array(); + $this->clearQueuedAddresses('cc'); + } + + /** + * Clear all BCC recipients. + * @return void + */ + public function clearBCCs() + { + foreach ($this->bcc as $bcc) { + unset($this->all_recipients[strtolower($bcc[0])]); + } + $this->bcc = array(); + $this->clearQueuedAddresses('bcc'); + } + + /** + * Clear all ReplyTo recipients. + * @return void + */ + public function clearReplyTos() + { + $this->ReplyTo = array(); + $this->ReplyToQueue = array(); + } + + /** + * Clear all recipient types. + * @return void + */ + public function clearAllRecipients() + { + $this->to = array(); + $this->cc = array(); + $this->bcc = array(); + $this->all_recipients = array(); + $this->RecipientsQueue = array(); + } + + /** + * Clear all filesystem, string, and binary attachments. + * @return void + */ + public function clearAttachments() + { + $this->attachment = array(); + } + + /** + * Clear all custom headers. + * @return void + */ + public function clearCustomHeaders() + { + $this->CustomHeader = array(); + } + + /** + * Add an error message to the error container. + * @access protected + * @param string $msg + * @return void + */ + protected function setError($msg) + { + $this->error_count++; + if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { + $lasterror = $this->smtp->getError(); + if (!empty($lasterror['error'])) { + $msg .= $this->lang('smtp_error') . $lasterror['error']; + if (!empty($lasterror['detail'])) { + $msg .= ' Detail: '. $lasterror['detail']; + } + if (!empty($lasterror['smtp_code'])) { + $msg .= ' SMTP code: ' . $lasterror['smtp_code']; + } + if (!empty($lasterror['smtp_code_ex'])) { + $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex']; + } + } + } + $this->ErrorInfo = $msg; + } + + /** + * Return an RFC 822 formatted date. + * @access public + * @return string + * @static + */ + public static function rfcDate() + { + // Set the time zone to whatever the default is to avoid 500 errors + // Will default to UTC if it's not set properly in php.ini + date_default_timezone_set(@date_default_timezone_get()); + return date('D, j M Y H:i:s O'); + } + + /** + * Get the server hostname. + * Returns 'localhost.localdomain' if unknown. + * @access protected + * @return string + */ + protected function serverHostname() + { + $result = 'localhost.localdomain'; + if (!empty($this->Hostname)) { + $result = $this->Hostname; + } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) { + $result = $_SERVER['SERVER_NAME']; + } elseif (function_exists('gethostname') && gethostname() !== false) { + $result = gethostname(); + } elseif (php_uname('n') !== false) { + $result = php_uname('n'); + } + return $result; + } + + /** + * Get an error message in the current language. + * @access protected + * @param string $key + * @return string + */ + protected function lang($key) + { + if (count($this->language) < 1) { + $this->setLanguage('en'); // set the default language + } + + if (array_key_exists($key, $this->language)) { + if ($key == 'smtp_connect_failed') { + //Include a link to troubleshooting docs on SMTP connection failure + //this is by far the biggest cause of support questions + //but it's usually not PHPMailer's fault. + return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting'; + } + return $this->language[$key]; + } else { + //Return the key as a fallback + return $key; + } + } + + /** + * Check if an error occurred. + * @access public + * @return boolean True if an error did occur. + */ + public function isError() + { + return ($this->error_count > 0); + } + + /** + * Ensure consistent line endings in a string. + * Changes every end of line from CRLF, CR or LF to $this->LE. + * @access public + * @param string $str String to fixEOL + * @return string + */ + public function fixEOL($str) + { + // Normalise to \n + $nstr = str_replace(array("\r\n", "\r"), "\n", $str); + // Now convert LE as needed + if ($this->LE !== "\n") { + $nstr = str_replace("\n", $this->LE, $nstr); + } + return $nstr; + } + + /** + * Add a custom header. + * $name value can be overloaded to contain + * both header name and value (name:value) + * @access public + * @param string $name Custom header name + * @param string $value Header value + * @return void + */ + public function addCustomHeader($name, $value = null) + { + if ($value === null) { + // Value passed in as name:value + $this->CustomHeader[] = explode(':', $name, 2); + } else { + $this->CustomHeader[] = array($name, $value); + } + } + + /** + * Returns all custom headers. + * @return array + */ + public function getCustomHeaders() + { + return $this->CustomHeader; + } + + /** + * Create a message body from an HTML string. + * Automatically inlines images and creates a plain-text version by converting the HTML, + * overwriting any existing values in Body and AltBody. + * $basedir is used when handling relative image paths, e.g. + * will look for an image file in $basedir/images/a.png and convert it to inline. + * If you don't want to apply these transformations to your HTML, just set Body and AltBody yourself. + * @access public + * @param string $message HTML message string + * @param string $basedir base directory for relative paths to images + * @param boolean|callable $advanced Whether to use the internal HTML to text converter + * or your own custom converter @see PHPMailer::html2text() + * @return string $message The transformed message Body + */ + public function msgHTML($message, $basedir = '', $advanced = false) + { + preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images); + if (array_key_exists(2, $images)) { + foreach ($images[2] as $imgindex => $url) { + // Convert data URIs into embedded images + if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) { + $data = substr($url, strpos($url, ',')); + if ($match[2]) { + $data = base64_decode($data); + } else { + $data = rawurldecode($data); + } + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 + if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) { + $message = str_replace( + $images[0][$imgindex], + $images[1][$imgindex] . '="cid:' . $cid . '"', + $message + ); + } + } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[a-z][a-z0-9+.-]*://#i', $url)) { + // Do not change urls for absolute images (thanks to corvuscorax) + // Do not change urls that are already inline images + $filename = basename($url); + $directory = dirname($url); + if ($directory == '.') { + $directory = ''; + } + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 + if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { + $basedir .= '/'; + } + if (strlen($directory) > 1 && substr($directory, -1) != '/') { + $directory .= '/'; + } + if ($this->addEmbeddedImage( + $basedir . $directory . $filename, + $cid, + $filename, + 'base64', + self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION)) + ) + ) { + $message = preg_replace( + '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui', + $images[1][$imgindex] . '="cid:' . $cid . '"', + $message + ); + } + } + } + } + $this->isHTML(true); + // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better + $this->Body = $this->normalizeBreaks($message); + $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced)); + if (!$this->alternativeExists()) { + $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . + self::CRLF . self::CRLF; + } + return $this->Body; + } + + /** + * Convert an HTML string into plain text. + * This is used by msgHTML(). + * Note - older versions of this function used a bundled advanced converter + * which was been removed for license reasons in #232. + * Example usage: + * + * // Use default conversion + * $plain = $mail->html2text($html); + * // Use your own custom converter + * $plain = $mail->html2text($html, function($html) { + * $converter = new MyHtml2text($html); + * return $converter->get_text(); + * }); + * + * @param string $html The HTML text to convert + * @param boolean|callable $advanced Any boolean value to use the internal converter, + * or provide your own callable for custom conversion. + * @return string + */ + public function html2text($html, $advanced = false) + { + if (is_callable($advanced)) { + return call_user_func($advanced, $html); + } + return html_entity_decode( + trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))), + ENT_QUOTES, + $this->CharSet + ); + } + + /** + * Get the MIME type for a file extension. + * @param string $ext File extension + * @access public + * @return string MIME type of file. + * @static + */ + public static function _mime_types($ext = '') + { + $mimes = array( + 'xl' => 'application/excel', + 'js' => 'application/javascript', + 'hqx' => 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'bin' => 'application/macbinary', + 'doc' => 'application/msword', + 'word' => 'application/msword', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12', + 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', + 'class' => 'application/octet-stream', + 'dll' => 'application/octet-stream', + 'dms' => 'application/octet-stream', + 'exe' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'psd' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'so' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => 'application/pdf', + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => 'application/vnd.ms-excel', + 'ppt' => 'application/vnd.ms-powerpoint', + 'wbxml' => 'application/vnd.wap.wbxml', + 'wmlc' => 'application/vnd.wap.wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'php3' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php' => 'application/x-httpd-php', + 'phtml' => 'application/x-httpd-php', + 'phps' => 'application/x-httpd-php-source', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + 'tgz' => 'application/x-tar', + 'xht' => 'application/xhtml+xml', + 'xhtml' => 'application/xhtml+xml', + 'zip' => 'application/zip', + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mp2' => 'audio/mpeg', + 'mp3' => 'audio/mpeg', + 'mpga' => 'audio/mpeg', + 'aif' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + 'jpeg' => 'image/jpeg', + 'jpe' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'png' => 'image/png', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'eml' => 'message/rfc822', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', + 'shtml' => 'text/html', + 'log' => 'text/plain', + 'text' => 'text/plain', + 'txt' => 'text/plain', + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'vcf' => 'text/vcard', + 'vcard' => 'text/vcard', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mov' => 'video/quicktime', + 'qt' => 'video/quicktime', + 'rv' => 'video/vnd.rn-realvideo', + 'avi' => 'video/x-msvideo', + 'movie' => 'video/x-sgi-movie' + ); + if (array_key_exists(strtolower($ext), $mimes)) { + return $mimes[strtolower($ext)]; + } + return 'application/octet-stream'; + } + + /** + * Map a file name to a MIME type. + * Defaults to 'application/octet-stream', i.e.. arbitrary binary data. + * @param string $filename A file name or full path, does not need to exist as a file + * @return string + * @static + */ + public static function filenameToType($filename) + { + // In case the path is a URL, strip any query string before getting extension + $qpos = strpos($filename, '?'); + if (false !== $qpos) { + $filename = substr($filename, 0, $qpos); + } + $pathinfo = self::mb_pathinfo($filename); + return self::_mime_types($pathinfo['extension']); + } + + /** + * Multi-byte-safe pathinfo replacement. + * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe. + * Works similarly to the one in PHP >= 5.2.0 + * @link http://www.php.net/manual/en/function.pathinfo.php#107461 + * @param string $path A filename or path, does not need to exist as a file + * @param integer|string $options Either a PATHINFO_* constant, + * or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2 + * @return string|array + * @static + */ + public static function mb_pathinfo($path, $options = null) + { + $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''); + $pathinfo = array(); + if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) { + if (array_key_exists(1, $pathinfo)) { + $ret['dirname'] = $pathinfo[1]; + } + if (array_key_exists(2, $pathinfo)) { + $ret['basename'] = $pathinfo[2]; + } + if (array_key_exists(5, $pathinfo)) { + $ret['extension'] = $pathinfo[5]; + } + if (array_key_exists(3, $pathinfo)) { + $ret['filename'] = $pathinfo[3]; + } + } + switch ($options) { + case PATHINFO_DIRNAME: + case 'dirname': + return $ret['dirname']; + case PATHINFO_BASENAME: + case 'basename': + return $ret['basename']; + case PATHINFO_EXTENSION: + case 'extension': + return $ret['extension']; + case PATHINFO_FILENAME: + case 'filename': + return $ret['filename']; + default: + return $ret; + } + } + + /** + * Set or reset instance properties. + * You should avoid this function - it's more verbose, less efficient, more error-prone and + * harder to debug than setting properties directly. + * Usage Example: + * `$mail->set('SMTPSecure', 'tls');` + * is the same as: + * `$mail->SMTPSecure = 'tls';` + * @access public + * @param string $name The property name to set + * @param mixed $value The value to set the property to + * @return boolean + * @TODO Should this not be using the __set() magic function? + */ + public function set($name, $value = '') + { + if (property_exists($this, $name)) { + $this->$name = $value; + return true; + } else { + $this->setError($this->lang('variable_set') . $name); + return false; + } + } + + /** + * Strip newlines to prevent header injection. + * @access public + * @param string $str + * @return string + */ + public function secureHeader($str) + { + return trim(str_replace(array("\r", "\n"), '', $str)); + } + + /** + * Normalize line breaks in a string. + * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format. + * Defaults to CRLF (for message bodies) and preserves consecutive breaks. + * @param string $text + * @param string $breaktype What kind of line break to use, defaults to CRLF + * @return string + * @access public + * @static + */ + public static function normalizeBreaks($text, $breaktype = "\r\n") + { + return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text); + } + + /** + * Set the public and private key files and password for S/MIME signing. + * @access public + * @param string $cert_filename + * @param string $key_filename + * @param string $key_pass Password for private key + * @param string $extracerts_filename Optional path to chain certificate + */ + public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '') + { + $this->sign_cert_file = $cert_filename; + $this->sign_key_file = $key_filename; + $this->sign_key_pass = $key_pass; + $this->sign_extracerts_file = $extracerts_filename; + } + + /** + * Quoted-Printable-encode a DKIM header. + * @access public + * @param string $txt + * @return string + */ + public function DKIM_QP($txt) + { + $line = ''; + for ($i = 0; $i < strlen($txt); $i++) { + $ord = ord($txt[$i]); + if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) { + $line .= $txt[$i]; + } else { + $line .= '=' . sprintf('%02X', $ord); + } + } + return $line; + } + + /** + * Generate a DKIM signature. + * @access public + * @param string $signHeader + * @throws phpmailerException + * @return string The DKIM signature value + */ + public function DKIM_Sign($signHeader) + { + if (!defined('PKCS7_TEXT')) { + if ($this->exceptions) { + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); + } + return ''; + } + $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private); + if ('' != $this->DKIM_passphrase) { + $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase); + } else { + $privKey = openssl_pkey_get_private($privKeyStr); + } + //Workaround for missing digest algorithms in old PHP & OpenSSL versions + //@link http://stackoverflow.com/a/11117338/333340 + if (version_compare(PHP_VERSION, '5.3.0') >= 0 and + in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) { + if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { + openssl_pkey_free($privKey); + return base64_encode($signature); + } + } else { + $pinfo = openssl_pkey_get_details($privKey); + $hash = hash('sha256', $signHeader); + //'Magic' constant for SHA256 from RFC3447 + //@link https://tools.ietf.org/html/rfc3447#page-43 + $t = '3031300d060960864801650304020105000420' . $hash; + $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3); + $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t); + + if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) { + openssl_pkey_free($privKey); + return base64_encode($signature); + } + } + openssl_pkey_free($privKey); + return ''; + } + + /** + * Generate a DKIM canonicalization header. + * @access public + * @param string $signHeader Header + * @return string + */ + public function DKIM_HeaderC($signHeader) + { + $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader); + $lines = explode("\r\n", $signHeader); + foreach ($lines as $key => $line) { + list($heading, $value) = explode(':', $line, 2); + $heading = strtolower($heading); + $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces + $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value + } + $signHeader = implode("\r\n", $lines); + return $signHeader; + } + + /** + * Generate a DKIM canonicalization body. + * @access public + * @param string $body Message Body + * @return string + */ + public function DKIM_BodyC($body) + { + if ($body == '') { + return "\r\n"; + } + // stabilize line endings + $body = str_replace("\r\n", "\n", $body); + $body = str_replace("\n", "\r\n", $body); + // END stabilize line endings + while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") { + $body = substr($body, 0, strlen($body) - 2); + } + return $body; + } + + /** + * Create the DKIM header and body in a new message header. + * @access public + * @param string $headers_line Header lines + * @param string $subject Subject + * @param string $body Body + * @return string + */ + public function DKIM_Add($headers_line, $subject, $body) + { + $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms + $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body + $DKIMquery = 'dns/txt'; // Query method + $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) + $subject_header = "Subject: $subject"; + $headers = explode($this->LE, $headers_line); + $from_header = ''; + $to_header = ''; + $date_header = ''; + $current = ''; + foreach ($headers as $header) { + if (strpos($header, 'From:') === 0) { + $from_header = $header; + $current = 'from_header'; + } elseif (strpos($header, 'To:') === 0) { + $to_header = $header; + $current = 'to_header'; + } elseif (strpos($header, 'Date:') === 0) { + $date_header = $header; + $current = 'date_header'; + } else { + if (!empty($$current) && strpos($header, ' =?') === 0) { + $$current .= $header; + } else { + $current = ''; + } + } + } + $from = str_replace('|', '=7C', $this->DKIM_QP($from_header)); + $to = str_replace('|', '=7C', $this->DKIM_QP($to_header)); + $date = str_replace('|', '=7C', $this->DKIM_QP($date_header)); + $subject = str_replace( + '|', + '=7C', + $this->DKIM_QP($subject_header) + ); // Copied header fields (dkim-quoted-printable) + $body = $this->DKIM_BodyC($body); + $DKIMlen = strlen($body); // Length of body + $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body + if ('' == $this->DKIM_identity) { + $ident = ''; + } else { + $ident = ' i=' . $this->DKIM_identity . ';'; + } + $dkimhdrs = 'DKIM-Signature: v=1; a=' . + $DKIMsignatureType . '; q=' . + $DKIMquery . '; l=' . + $DKIMlen . '; s=' . + $this->DKIM_selector . + ";\r\n" . + "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" . + "\th=From:To:Date:Subject;\r\n" . + "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" . + "\tz=$from\r\n" . + "\t|$to\r\n" . + "\t|$date\r\n" . + "\t|$subject;\r\n" . + "\tbh=" . $DKIMb64 . ";\r\n" . + "\tb="; + $toSign = $this->DKIM_HeaderC( + $from_header . "\r\n" . + $to_header . "\r\n" . + $date_header . "\r\n" . + $subject_header . "\r\n" . + $dkimhdrs + ); + $signed = $this->DKIM_Sign($toSign); + return $dkimhdrs . $signed . "\r\n"; + } + + /** + * Detect if a string contains a line longer than the maximum line length allowed. + * @param string $str + * @return boolean + * @static + */ + public static function hasLineLongerThanMax($str) + { + //+2 to include CRLF line break for a 1000 total + return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str); + } + + /** + * Allows for public read access to 'to' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getToAddresses() + { + return $this->to; + } + + /** + * Allows for public read access to 'cc' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getCcAddresses() + { + return $this->cc; + } + + /** + * Allows for public read access to 'bcc' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getBccAddresses() + { + return $this->bcc; + } + + /** + * Allows for public read access to 'ReplyTo' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getReplyToAddresses() + { + return $this->ReplyTo; + } + + /** + * Allows for public read access to 'all_recipients' property. + * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included. + * @access public + * @return array + */ + public function getAllRecipientAddresses() + { + return $this->all_recipients; + } + + /** + * Perform a callback. + * @param boolean $isSent + * @param array $to + * @param array $cc + * @param array $bcc + * @param string $subject + * @param string $body + * @param string $from + */ + protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from) + { + if (!empty($this->action_function) && is_callable($this->action_function)) { + $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from); + call_user_func_array($this->action_function, $params); + } + } +} + +/** + * PHPMailer exception handler + * @package PHPMailer + */ +class phpmailerException extends Exception +{ + /** + * Prettify error message output + * @return string + */ + public function errorMessage() + { + $errorMsg = '' . $this->getMessage() . "
\n"; + return $errorMsg; + } +} From 1fa7a6991f899f8ba47ffbc461ebecb685388df0 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 8 Jan 2017 16:20:58 +0100 Subject: [PATCH 41/58] mailstream: update version number to v1.1 --- mailstream/mailstream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index e450910d2..c3e4974de 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -2,7 +2,7 @@ /** * Name: Mail Stream * Description: Mail all items coming into your network feed to an email address - * Version: 1.0 + * Version: 1.1 * Author: Matthew Exon */ From e7558b1873a96913b30d8a6f20a3f10dabbe4432 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 11 Jan 2017 00:34:13 +0000 Subject: [PATCH 42/58] The Diaspora export is now working again. --- diaspora/Diaspora_Connection.php | 263 +++++++++++++++++++++++++++++++ diaspora/diaspora.css | 4 +- diaspora/diaspora.php | 111 ++++++++----- 3 files changed, 333 insertions(+), 45 deletions(-) create mode 100644 diaspora/Diaspora_Connection.php diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php new file mode 100644 index 000000000..fae6432e2 --- /dev/null +++ b/diaspora/Diaspora_Connection.php @@ -0,0 +1,263 @@ + + * Modifications by Michael Vogel + */ + +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('/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; + } + +} diff --git a/diaspora/diaspora.css b/diaspora/diaspora.css index 7c6d107d7..21ef9bc51 100755 --- 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; } diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 35234c390..aed80b88b 100755 --- 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 - * 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 .= '

"] = "Use '%s' como Redirigir URI"; $a->strings["Client ID"] = "ID de cliente"; $a->strings["Client Secret"] = "Secreto de cliente"; From 48d112f22218cfa14986b243fa64d735898461b6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:42:50 +0100 Subject: [PATCH 09/58] ES curweather --- curweather/lang/es/messages.po | 132 +++++++++++++++++++++++++++++++++ curweather/lang/es/strings.php | 37 ++++++++- 2 files changed, 166 insertions(+), 3 deletions(-) create mode 100644 curweather/lang/es/messages.po diff --git a/curweather/lang/es/messages.po b/curweather/lang/es/messages.po new file mode 100644 index 000000000..6dfd444de --- /dev/null +++ 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 , 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 \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. Berlin,DE or " +"14476,DE." +msgstr "Identificador de su ubicación (nombre o código postal), ej. Berlin,DE o 14476,DE." + +#: curweather.php:176 +msgid "Units" +msgstr "Unidades" + +#: curweather.php:176 +msgid "select if the temperature should be displayed in °C or °F" +msgstr "seleccionar si la temperatura debería ser mostrada en °C o °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" diff --git a/curweather/lang/es/strings.php b/curweather/lang/es/strings.php index 2394f48b4..f968076a7 100644 --- a/curweather/lang/es/strings.php +++ b/curweather/lang/es/strings.php @@ -1,3 +1,34 @@ -strings["Submit"] = "Envíar"; +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. Berlin,DE or 14476,DE."] = "Identificador de su ubicación (nombre o código postal), ej. Berlin,DE o 14476,DE."; +$a->strings["Units"] = "Unidades"; +$a->strings["select if the temperature should be displayed in °C or °F"] = "seleccionar si la temperatura debería ser mostrada en °C o °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"; From 14f4af7f8424b8c0a5bfae32c31ffdaccca094be Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:44:25 +0100 Subject: [PATCH 10/58] ES dwpost --- dwpost/lang/es/messages.po | 48 ++++++++++++++++++++++++++++++++++++++ dwpost/lang/es/strings.php | 23 +++++++++++------- 2 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 dwpost/lang/es/messages.po diff --git a/dwpost/lang/es/messages.po b/dwpost/lang/es/messages.po new file mode 100644 index 000000000..10368bb28 --- /dev/null +++ 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 , 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 \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" diff --git a/dwpost/lang/es/strings.php b/dwpost/lang/es/strings.php index 11e6ff59a..646b945bd 100644 --- a/dwpost/lang/es/strings.php +++ b/dwpost/lang/es/strings.php @@ -1,9 +1,14 @@ -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"; +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"; From 1df8bc583e95e2b582a244bb1b1a57578c9e8740 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:45:36 +0100 Subject: [PATCH 11/58] ES editplain --- editplain/lang/es/messages.po | 36 +++++++++++++++++++++++++++++++++++ editplain/lang/es/strings.php | 17 +++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 editplain/lang/es/messages.po diff --git a/editplain/lang/es/messages.po b/editplain/lang/es/messages.po new file mode 100644 index 000000000..97fd2c02c --- /dev/null +++ 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 , 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 \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" diff --git a/editplain/lang/es/strings.php b/editplain/lang/es/strings.php index 049b69b38..40caa5b0e 100644 --- a/editplain/lang/es/strings.php +++ b/editplain/lang/es/strings.php @@ -1,6 +1,11 @@ -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"; +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"; From e49092619975eaef6146860c1b2319957fde2c23 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:46:54 +0100 Subject: [PATCH 12/58] ES forumdirectory --- forumdirectory/lang/es/messages.po | 80 ++++++++++++++++++++++++++++++ forumdirectory/lang/es/strings.php | 38 ++++++++------ 2 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 forumdirectory/lang/es/messages.po diff --git a/forumdirectory/lang/es/messages.po b/forumdirectory/lang/es/messages.po new file mode 100644 index 000000000..ae1f3a482 --- /dev/null +++ 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 , 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 \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)." diff --git a/forumdirectory/lang/es/strings.php b/forumdirectory/lang/es/strings.php index e89e138c1..03341780c 100644 --- a/forumdirectory/lang/es/strings.php +++ b/forumdirectory/lang/es/strings.php @@ -1,16 +1,22 @@ -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)."; +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)."; From 7f3a1217a3a2d303ab6733013719b2bfc59aadd5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:48:26 +0100 Subject: [PATCH 13/58] ES forumlist --- forumlist/lang/es/messages.po | 60 +++++++++++++++++++++++++++++++++++ forumlist/lang/es/strings.php | 29 ++++++++++------- 2 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 forumlist/lang/es/messages.po diff --git a/forumlist/lang/es/messages.po b/forumlist/lang/es/messages.po new file mode 100644 index 000000000..5280a1cbf --- /dev/null +++ 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 , 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 \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" diff --git a/forumlist/lang/es/strings.php b/forumlist/lang/es/strings.php index 2d4e27954..6b7d13bb4 100644 --- a/forumlist/lang/es/strings.php +++ b/forumlist/lang/es/strings.php @@ -1,12 +1,17 @@ -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"; +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"; From c296f5e59115f309db6f231d14f6060ea39fe50b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:52:05 +0100 Subject: [PATCH 14/58] ES fromapp --- fromapp/lang/es/messages.po | 41 +++++++++++++++++++++++++++++++++++++ fromapp/lang/es/strings.php | 19 ++++++++++------- 2 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 fromapp/lang/es/messages.po diff --git a/fromapp/lang/es/messages.po b/fromapp/lang/es/messages.po new file mode 100644 index 000000000..4abce4a8e --- /dev/null +++ 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 , 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 \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" diff --git a/fromapp/lang/es/strings.php b/fromapp/lang/es/strings.php index 8fe518fd4..84e1dcf84 100644 --- a/fromapp/lang/es/strings.php +++ b/fromapp/lang/es/strings.php @@ -1,7 +1,12 @@ -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"; +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"; From 99b69aaa95d2ec4338b3965319ce57267970368d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:53:17 +0100 Subject: [PATCH 15/58] ES fromgplus --- fromgplus/lang/es/messages.po | 40 +++++++++++++++++++++++++++++++++++ fromgplus/lang/es/strings.php | 19 +++++++++++------ 2 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 fromgplus/lang/es/messages.po diff --git a/fromgplus/lang/es/messages.po b/fromgplus/lang/es/messages.po new file mode 100644 index 000000000..ac944d6a4 --- /dev/null +++ b/fromgplus/lang/es/messages.po @@ -0,0 +1,40 @@ +# ADDON fromgplus +# Copyright (C) +# This file is distributed under the same license as the Friendica fromgplus addon package. +# +# +# Translators: +# Alberto Díaz Tormo , 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:49+0000\n" +"Last-Translator: Alberto Díaz Tormo \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:33 +msgid "Google+ Import Settings" +msgstr "Ajustes de importación de Google+" + +#: fromgplus.php:36 +msgid "Enable Google+ Import" +msgstr "Habilitar importación de Google+" + +#: fromgplus.php:39 +msgid "Google Account ID" +msgstr "ID de cuenta de Google" + +#: fromgplus.php:44 +msgid "Submit" +msgstr "Enviar" + +#: fromgplus.php:59 +msgid "Google+ Import Settings saved." +msgstr "Ajustes de importación de Google+ guardados." diff --git a/fromgplus/lang/es/strings.php b/fromgplus/lang/es/strings.php index 4ea59f9ac..3a96b1ac0 100644 --- a/fromgplus/lang/es/strings.php +++ b/fromgplus/lang/es/strings.php @@ -1,7 +1,12 @@ -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."; +strings["Google+ Import Settings"] = "Ajustes de importación de Google+"; +$a->strings["Enable Google+ Import"] = "Habilitar importación de Google+"; +$a->strings["Google Account ID"] = "ID de cuenta de Google"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Google+ Import Settings saved."] = "Ajustes de importación de Google+ guardados."; From a220c6170d523992e3ba30dca2eedec5d44e3655 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:54:56 +0100 Subject: [PATCH 16/58] ES dav --- dav/lang/es/messages.po | 578 ++++++++++++++++++++++++++++++++++++++++ dav/lang/es/strings.php | 277 +++++++++---------- 2 files changed, 719 insertions(+), 136 deletions(-) create mode 100644 dav/lang/es/messages.po diff --git a/dav/lang/es/messages.po b/dav/lang/es/messages.po new file mode 100644 index 000000000..c5c623ee0 --- /dev/null +++ b/dav/lang/es/messages.po @@ -0,0 +1,578 @@ +# ADDON dav +# Copyright (C) +# This file is distributed under the same license as the Friendica dav addon package. +# +# +# Translators: +# Alberto Díaz Tormo , 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-08 16:28+0000\n" +"Last-Translator: Alberto Díaz Tormo \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 "" + +#: friendica/main.php:309 +msgid "The database tables have been installed." +msgstr "" + +#: friendica/main.php:310 +msgid "An error occurred during the installation." +msgstr "" + +#: friendica/main.php:316 +msgid "The database tables have been updated." +msgstr "" + +#: friendica/main.php:317 +msgid "An error occurred during the update." +msgstr "" + +#: friendica/main.php:333 +msgid "No system-wide settings yet." +msgstr "" + +#: friendica/main.php:336 +msgid "Database status" +msgstr "" + +#: friendica/main.php:339 +msgid "Installed" +msgstr "" + +#: friendica/main.php:343 +msgid "Upgrade needed" +msgstr "" + +#: friendica/main.php:343 +msgid "" +"Please back up all calendar data (the tables beginning with dav_*) before " +"proceeding. While all calendar events should 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 "" + +#: friendica/main.php:343 +msgid "Upgrade" +msgstr "" + +#: friendica/main.php:346 +msgid "Not installed" +msgstr "" + +#: friendica/main.php:346 +msgid "Install" +msgstr "" + +#: friendica/main.php:350 +msgid "Unknown" +msgstr "" + +#: 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 "" + +#: friendica/main.php:355 +msgid "Troubleshooting" +msgstr "" + +#: friendica/main.php:356 +msgid "Manual creation of the database tables:" +msgstr "" + +#: friendica/main.php:357 +msgid "Show SQL-statements" +msgstr "" + +#: friendica/calendar.friendica.fnk.php:206 +msgid "Private Calendar" +msgstr "" + +#: friendica/calendar.friendica.fnk.php:207 +msgid "Friendica Events: Mine" +msgstr "" + +#: friendica/calendar.friendica.fnk.php:208 +msgid "Friendica Events: Contacts" +msgstr "" + +#: friendica/calendar.friendica.fnk.php:248 +msgid "Private Addresses" +msgstr "" + +#: friendica/calendar.friendica.fnk.php:249 +msgid "Friendica Contacts" +msgstr "" + +#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738 +msgid "Could not open component for editing" +msgstr "" + +#: common/wdcal_edit.inc.php:144 +msgid "Event data" +msgstr "" + +#: common/wdcal_edit.inc.php:163 +msgid "Special color" +msgstr "" + +#: common/wdcal_edit.inc.php:169 +msgid "Subject" +msgstr "" + +#: common/wdcal_edit.inc.php:173 +msgid "Starts" +msgstr "" + +#: common/wdcal_edit.inc.php:178 +msgid "Ends" +msgstr "" + +#: common/wdcal_edit.inc.php:183 +msgid "Location" +msgstr "" + +#: common/wdcal_edit.inc.php:185 +msgid "Description" +msgstr "" + +#: common/wdcal_edit.inc.php:188 +msgid "Recurrence" +msgstr "" + +#: common/wdcal_edit.inc.php:190 +msgid "Frequency" +msgstr "" + +#: common/wdcal_edit.inc.php:191 +msgid "None" +msgstr "" + +#: common/wdcal_edit.inc.php:194 +msgid "Daily" +msgstr "" + +#: common/wdcal_edit.inc.php:197 +msgid "Weekly" +msgstr "" + +#: common/wdcal_edit.inc.php:200 +msgid "Monthly" +msgstr "" + +#: common/wdcal_edit.inc.php:203 +msgid "Yearly" +msgstr "" + +#: common/wdcal_edit.inc.php:214 +msgid "days" +msgstr "" + +#: common/wdcal_edit.inc.php:215 +msgid "weeks" +msgstr "" + +#: common/wdcal_edit.inc.php:216 +msgid "months" +msgstr "" + +#: common/wdcal_edit.inc.php:217 +msgid "years" +msgstr "" + +#: common/wdcal_edit.inc.php:218 +msgid "Interval" +msgstr "" + +#: common/wdcal_edit.inc.php:218 +msgid "All %select% %time%" +msgstr "" + +#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260 +#: common/wdcal_edit.inc.php:481 +msgid "Days" +msgstr "" + +#: 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 "" + +#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274 +#: common/wdcal_edit.inc.php:308 +msgid "Monday" +msgstr "" + +#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277 +msgid "Tuesday" +msgstr "" + +#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280 +msgid "Wednesday" +msgstr "" + +#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283 +msgid "Thursday" +msgstr "" + +#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286 +msgid "Friday" +msgstr "" + +#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289 +msgid "Saturday" +msgstr "" + +#: common/wdcal_edit.inc.php:297 +msgid "First day of week:" +msgstr "" + +#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373 +msgid "Day of month" +msgstr "" + +#: common/wdcal_edit.inc.php:354 +msgid "#num#th of each month" +msgstr "" + +#: common/wdcal_edit.inc.php:357 +msgid "#num#th-last of each month" +msgstr "" + +#: common/wdcal_edit.inc.php:360 +msgid "#num#th #wkday# of each month" +msgstr "" + +#: common/wdcal_edit.inc.php:363 +msgid "#num#th-last #wkday# of each month" +msgstr "" + +#: common/wdcal_edit.inc.php:377 +msgid "#num#th of the given month" +msgstr "" + +#: common/wdcal_edit.inc.php:380 +msgid "#num#th-last of the given month" +msgstr "" + +#: common/wdcal_edit.inc.php:383 +msgid "#num#th #wkday# of the given month" +msgstr "" + +#: common/wdcal_edit.inc.php:386 +msgid "#num#th-last #wkday# of the given month" +msgstr "" + +#: common/wdcal_edit.inc.php:413 +msgid "Repeat until" +msgstr "" + +#: common/wdcal_edit.inc.php:417 +msgid "Infinite" +msgstr "" + +#: common/wdcal_edit.inc.php:420 +msgid "Until the following date" +msgstr "" + +#: common/wdcal_edit.inc.php:423 +msgid "Number of times" +msgstr "" + +#: common/wdcal_edit.inc.php:429 +msgid "Exceptions" +msgstr "" + +#: common/wdcal_edit.inc.php:432 +msgid "none" +msgstr "" + +#: common/wdcal_edit.inc.php:449 +msgid "Notification" +msgstr "" + +#: common/wdcal_edit.inc.php:466 +msgid "Notify by" +msgstr "" + +#: common/wdcal_edit.inc.php:468 +msgid "Remove" +msgstr "" + +#: common/wdcal_edit.inc.php:469 +msgid "E-Mail" +msgstr "" + +#: common/wdcal_edit.inc.php:470 +msgid "On Friendica / Display" +msgstr "" + +#: common/wdcal_edit.inc.php:474 +msgid "Time" +msgstr "" + +#: common/wdcal_edit.inc.php:478 +msgid "Hours" +msgstr "" + +#: common/wdcal_edit.inc.php:479 +msgid "Minutes" +msgstr "" + +#: common/wdcal_edit.inc.php:480 +msgid "Seconds" +msgstr "" + +#: common/wdcal_edit.inc.php:482 +msgid "Weeks" +msgstr "" + +#: common/wdcal_edit.inc.php:485 +msgid "before the" +msgstr "" + +#: common/wdcal_edit.inc.php:486 +msgid "start of the event" +msgstr "" + +#: common/wdcal_edit.inc.php:487 +msgid "end of the event" +msgstr "" + +#: common/wdcal_edit.inc.php:492 +msgid "Add a notification" +msgstr "" + +#: common/wdcal_edit.inc.php:687 +msgid "The event #name# will start at #date" +msgstr "" + +#: common/wdcal_edit.inc.php:696 +msgid "#name# is about to begin." +msgstr "" + +#: common/wdcal_edit.inc.php:769 +msgid "Saved" +msgstr "" + +#: common/wdcal_configuration.php:148 +msgid "U.S. Time Format (mm/dd/YYYY)" +msgstr "" + +#: common/wdcal_configuration.php:243 +msgid "German Time Format (dd.mm.YYYY)" +msgstr "" + +#: common/dav_caldav_backend_private.inc.php:39 +msgid "Private Events" +msgstr "" + +#: 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 "" + +#: common/dav_carddav_backend_private.inc.php:46 +msgid "Private Addressbooks" +msgstr "" diff --git a/dav/lang/es/strings.php b/dav/lang/es/strings.php index f28ecdeb1..8d60adfe9 100644 --- a/dav/lang/es/strings.php +++ b/dav/lang/es/strings.php @@ -1,136 +1,141 @@ -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 should 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 deberían 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"; +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: "] = ""; +$a->strings["The database tables have been installed."] = ""; +$a->strings["An error occurred during the installation."] = ""; +$a->strings["The database tables have been updated."] = ""; +$a->strings["An error occurred during the update."] = ""; +$a->strings["No system-wide settings yet."] = ""; +$a->strings["Database status"] = ""; +$a->strings["Installed"] = ""; +$a->strings["Upgrade needed"] = ""; +$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events should 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."] = ""; +$a->strings["Upgrade"] = ""; +$a->strings["Not installed"] = ""; +$a->strings["Install"] = ""; +$a->strings["Unknown"] = ""; +$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."] = ""; +$a->strings["Troubleshooting"] = ""; +$a->strings["Manual creation of the database tables:"] = ""; +$a->strings["Show SQL-statements"] = ""; +$a->strings["Private Calendar"] = ""; +$a->strings["Friendica Events: Mine"] = ""; +$a->strings["Friendica Events: Contacts"] = ""; +$a->strings["Private Addresses"] = ""; +$a->strings["Friendica Contacts"] = ""; +$a->strings["Could not open component for editing"] = ""; +$a->strings["Event data"] = ""; +$a->strings["Special color"] = ""; +$a->strings["Subject"] = ""; +$a->strings["Starts"] = ""; +$a->strings["Ends"] = ""; +$a->strings["Location"] = ""; +$a->strings["Description"] = ""; +$a->strings["Recurrence"] = ""; +$a->strings["Frequency"] = ""; +$a->strings["None"] = ""; +$a->strings["Daily"] = ""; +$a->strings["Weekly"] = ""; +$a->strings["Monthly"] = ""; +$a->strings["Yearly"] = ""; +$a->strings["days"] = ""; +$a->strings["weeks"] = ""; +$a->strings["months"] = ""; +$a->strings["years"] = ""; +$a->strings["Interval"] = ""; +$a->strings["All %select% %time%"] = ""; +$a->strings["Days"] = ""; +$a->strings["Sunday"] = ""; +$a->strings["Monday"] = ""; +$a->strings["Tuesday"] = ""; +$a->strings["Wednesday"] = ""; +$a->strings["Thursday"] = ""; +$a->strings["Friday"] = ""; +$a->strings["Saturday"] = ""; +$a->strings["First day of week:"] = ""; +$a->strings["Day of month"] = ""; +$a->strings["#num#th of each month"] = ""; +$a->strings["#num#th-last of each month"] = ""; +$a->strings["#num#th #wkday# of each month"] = ""; +$a->strings["#num#th-last #wkday# of each month"] = ""; +$a->strings["#num#th of the given month"] = ""; +$a->strings["#num#th-last of the given month"] = ""; +$a->strings["#num#th #wkday# of the given month"] = ""; +$a->strings["#num#th-last #wkday# of the given month"] = ""; +$a->strings["Repeat until"] = ""; +$a->strings["Infinite"] = ""; +$a->strings["Until the following date"] = ""; +$a->strings["Number of times"] = ""; +$a->strings["Exceptions"] = ""; +$a->strings["none"] = ""; +$a->strings["Notification"] = ""; +$a->strings["Notify by"] = ""; +$a->strings["Remove"] = ""; +$a->strings["E-Mail"] = ""; +$a->strings["On Friendica / Display"] = ""; +$a->strings["Time"] = ""; +$a->strings["Hours"] = ""; +$a->strings["Minutes"] = ""; +$a->strings["Seconds"] = ""; +$a->strings["Weeks"] = ""; +$a->strings["before the"] = ""; +$a->strings["start of the event"] = ""; +$a->strings["end of the event"] = ""; +$a->strings["Add a notification"] = ""; +$a->strings["The event #name# will start at #date"] = ""; +$a->strings["#name# is about to begin."] = ""; +$a->strings["Saved"] = ""; +$a->strings["U.S. Time Format (mm/dd/YYYY)"] = ""; +$a->strings["German Time Format (dd.mm.YYYY)"] = ""; +$a->strings["Private Events"] = ""; +$a->strings["No access"] = ""; +$a->strings["Private Addressbooks"] = ""; From 64806e92fb682a3dfe88d6a9d56f3150813a53d4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 10 Nov 2016 10:56:36 +0100 Subject: [PATCH 17/58] ES notifyall --- notifyall/lang/es/messages.po | 57 +++++++++++++++++++++++++++++++++++ notifyall/lang/es/strings.php | 16 ++++++++++ 2 files changed, 73 insertions(+) create mode 100644 notifyall/lang/es/messages.po create mode 100644 notifyall/lang/es/strings.php diff --git a/notifyall/lang/es/messages.po b/notifyall/lang/es/messages.po new file mode 100644 index 000000000..5d2536fed --- /dev/null +++ b/notifyall/lang/es/messages.po @@ -0,0 +1,57 @@ +# ADDON notifyall +# Copyright (C) +# This file is distributed under the same license as the Friendica notifyall addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-14 16:41+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Alberto Díaz Tormo , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/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" + +#: notifyall.php:26 +msgid "Send email to all members" +msgstr "Enviar email a todos los miembros" + +#: notifyall.php:42 +#, php-format +msgid "%s Administrator" +msgstr "%s Administrador" + +#: notifyall.php:44 +#, php-format +msgid "%1$s, %2$s Administrator" +msgstr "%1$s, %2$s Administrador" + +#: notifyall.php:60 +msgid "No recipients found." +msgstr "No se encontraron destinatarios." + +#: notifyall.php:78 +msgid "Emails sent" +msgstr "Emails enviados" + +#: notifyall.php:86 +msgid "Send email to all members of this Friendica instance." +msgstr "Enviar email a todos los miembros de esta instancia de Friendica." + +#: notifyall.php:91 +msgid "Message subject" +msgstr "Tema del mensaje" + +#: notifyall.php:92 +msgid "Test mode (only send to administrator)" +msgstr "Modo de prueba (sólo envíar al administrador)" + +#: notifyall.php:93 +msgid "Submit" +msgstr "Enviar" diff --git a/notifyall/lang/es/strings.php b/notifyall/lang/es/strings.php new file mode 100644 index 000000000..312a6acd8 --- /dev/null +++ b/notifyall/lang/es/strings.php @@ -0,0 +1,16 @@ +strings["Send email to all members"] = "Enviar email a todos los miembros"; +$a->strings["%s Administrator"] = "%s Administrador"; +$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrador"; +$a->strings["No recipients found."] = "No se encontraron destinatarios."; +$a->strings["Emails sent"] = "Emails enviados"; +$a->strings["Send email to all members of this Friendica instance."] = "Enviar email a todos los miembros de esta instancia de Friendica."; +$a->strings["Message subject"] = "Tema del mensaje"; +$a->strings["Test mode (only send to administrator)"] = "Modo de prueba (sólo envíar al administrador)"; +$a->strings["Submit"] = "Enviar"; From d1a498ed38230bb2ccd2a422080dab37c3aee03b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 12 Nov 2016 16:54:08 +0000 Subject: [PATCH 18/58] Some language stuff. --- fromgplus/lang/C/messages.po | 28 ++++++++++++++++++++-------- gpluspost/lang/C/messages.po | 26 +++++++++++++------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/fromgplus/lang/C/messages.po b/fromgplus/lang/C/messages.po index f9b406622..d78fb5af5 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/gpluspost/lang/C/messages.po b/gpluspost/lang/C/messages.po index cedf6cbbe..117b72e51 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "" From b59c0e54a81eede00700b2feed1b8a2e6559494e Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 15 Nov 2016 06:36:52 +0000 Subject: [PATCH 19/58] The URI of mirrored posts are now looking more standard --- fromgplus/fromgplus.php | 6 ++++-- ifttt/ifttt.php | 5 ++++- statusnet/statusnet.php | 5 +++-- twitter/twitter.php | 5 +++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 4c96892c6..f4a61ec2d 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -11,6 +11,7 @@ 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'); @@ -164,8 +165,9 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) { $_REQUEST['source'] = $source; $_REQUEST['extid'] = NETWORK_GPLUS; - if (isset($id)) - $_REQUEST['message_id'] = NETWORK_GPLUS.":".$id; + if (isset($id)) { + $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id); + } // $_REQUEST['verb'] // $_REQUEST['parent'] diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 382365095..35f3ccc6c 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -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"]); diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index febe4032f..bc9bc125f 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -872,8 +872,9 @@ function statusnet_fetchtimeline($a, $uid) { $_REQUEST["source"] = $post->source; $_REQUEST["extid"] = NETWORK_STATUSNET; - if (isset($post->id)) - $_REQUEST['message_id'] = NETWORK_STATUSNET.":".$post->id; + if (isset($post->id)) { + $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id); + } //$_REQUEST["date"] = $post->created_at; diff --git a/twitter/twitter.php b/twitter/twitter.php index e7429696d..1cc8fd649 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -791,8 +791,9 @@ function twitter_fetchtimeline($a, $uid) { $_REQUEST["source"] = $post->source; $_REQUEST["extid"] = NETWORK_TWITTER; - if (isset($post->id)) - $_REQUEST['message_id'] = NETWORK_TWITTER.":".$post->id; + if (isset($post->id)) { + $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id); + } //$_REQUEST["date"] = $post->created_at; From 0771c0566ff1a9638602d3d6a235aa2b881569e3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 17 Nov 2016 07:38:41 +0100 Subject: [PATCH 20/58] ES translations THX Albert --- dav/lang/es/messages.po | 187 +++++++++++++++++---------------- dav/lang/es/strings.php | 180 +++++++++++++++---------------- fromgplus/lang/es/messages.po | 39 ++++--- fromgplus/lang/es/strings.php | 7 +- geonames/lang/es/messages.po | 36 +++++++ geonames/lang/es/strings.php | 17 +-- gnot/lang/es/messages.po | 47 +++++++++ gnot/lang/es/strings.php | 21 ++-- gpluspost/lang/es/messages.po | 68 ++++++++++++ gravatar/lang/es/messages.po | 75 +++++++++++++ gravatar/lang/es/strings.php | 35 +++--- group_text/lang/es/messages.po | 36 +++++++ group_text/lang/es/strings.php | 16 ++- ijpost/lang/es/messages.po | 48 +++++++++ ijpost/lang/es/strings.php | 23 ++-- 15 files changed, 594 insertions(+), 241 deletions(-) create mode 100644 geonames/lang/es/messages.po create mode 100644 gnot/lang/es/messages.po create mode 100644 gpluspost/lang/es/messages.po create mode 100644 gravatar/lang/es/messages.po create mode 100644 group_text/lang/es/messages.po create mode 100644 ijpost/lang/es/messages.po diff --git a/dav/lang/es/messages.po b/dav/lang/es/messages.po index c5c623ee0..d00bbe260 100644 --- a/dav/lang/es/messages.po +++ b/dav/lang/es/messages.po @@ -4,14 +4,15 @@ # # # Translators: -# Alberto Díaz Tormo , 2016 +# 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-08 16:28+0000\n" -"Last-Translator: Alberto Díaz Tormo \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" @@ -204,39 +205,39 @@ msgstr "no responder" #: friendica/main.php:282 msgid "Notification: " -msgstr "" +msgstr "Notificación: " #: friendica/main.php:309 msgid "The database tables have been installed." -msgstr "" +msgstr "Las tablas de bases de datos se han instalado." #: friendica/main.php:310 msgid "An error occurred during the installation." -msgstr "" +msgstr "Hubo un error durante la instalación." #: friendica/main.php:316 msgid "The database tables have been updated." -msgstr "" +msgstr "Las tablas de bases de datos se han actualizado." #: friendica/main.php:317 msgid "An error occurred during the update." -msgstr "" +msgstr "Hubo un error durante la actualización." #: friendica/main.php:333 msgid "No system-wide settings yet." -msgstr "" +msgstr "Aún no hay ajustes para todo el sistema." #: friendica/main.php:336 msgid "Database status" -msgstr "" +msgstr "Estado de base de datos" #: friendica/main.php:339 msgid "Installed" -msgstr "" +msgstr "Instalado" #: friendica/main.php:343 msgid "Upgrade needed" -msgstr "" +msgstr "Actualización requerida" #: friendica/main.php:343 msgid "" @@ -245,23 +246,23 @@ msgid "" "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 "" +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 deberían 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 "" +msgstr "Actualizar" #: friendica/main.php:346 msgid "Not installed" -msgstr "" +msgstr "No instalado" #: friendica/main.php:346 msgid "Install" -msgstr "" +msgstr "Instalar" #: friendica/main.php:350 msgid "Unknown" -msgstr "" +msgstr "Desconocido" #: friendica/main.php:350 msgid "" @@ -269,310 +270,310 @@ msgid "" " 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 "" +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 "" +msgstr "Resolución de problemas" #: friendica/main.php:356 msgid "Manual creation of the database tables:" -msgstr "" +msgstr "Creación manual de las tablas de base de datos:" #: friendica/main.php:357 msgid "Show SQL-statements" -msgstr "" +msgstr "Mostrar declaraciones SQL" #: friendica/calendar.friendica.fnk.php:206 msgid "Private Calendar" -msgstr "" +msgstr "Calendario Privado" #: friendica/calendar.friendica.fnk.php:207 msgid "Friendica Events: Mine" -msgstr "" +msgstr "Eventos de Friendica: Mío" #: friendica/calendar.friendica.fnk.php:208 msgid "Friendica Events: Contacts" -msgstr "" +msgstr "Efentos de Friendica: Contactos" #: friendica/calendar.friendica.fnk.php:248 msgid "Private Addresses" -msgstr "" +msgstr "Direcciones Privadas" #: friendica/calendar.friendica.fnk.php:249 msgid "Friendica Contacts" -msgstr "" +msgstr "Contactos de Friendica" #: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738 msgid "Could not open component for editing" -msgstr "" +msgstr "Podría no abrir el componente para editar" #: common/wdcal_edit.inc.php:144 msgid "Event data" -msgstr "" +msgstr "Información de evento" #: common/wdcal_edit.inc.php:163 msgid "Special color" -msgstr "" +msgstr "Color especial" #: common/wdcal_edit.inc.php:169 msgid "Subject" -msgstr "" +msgstr "Tema" #: common/wdcal_edit.inc.php:173 msgid "Starts" -msgstr "" +msgstr "Empieza" #: common/wdcal_edit.inc.php:178 msgid "Ends" -msgstr "" +msgstr "Termina" #: common/wdcal_edit.inc.php:183 msgid "Location" -msgstr "" +msgstr "Ubicación" #: common/wdcal_edit.inc.php:185 msgid "Description" -msgstr "" +msgstr "Descripción" #: common/wdcal_edit.inc.php:188 msgid "Recurrence" -msgstr "" +msgstr "Repetición" #: common/wdcal_edit.inc.php:190 msgid "Frequency" -msgstr "" +msgstr "Frecuencia" #: common/wdcal_edit.inc.php:191 msgid "None" -msgstr "" +msgstr "Ninguno" #: common/wdcal_edit.inc.php:194 msgid "Daily" -msgstr "" +msgstr "Diariamente" #: common/wdcal_edit.inc.php:197 msgid "Weekly" -msgstr "" +msgstr "Semanalmente" #: common/wdcal_edit.inc.php:200 msgid "Monthly" -msgstr "" +msgstr "Mensual" #: common/wdcal_edit.inc.php:203 msgid "Yearly" -msgstr "" +msgstr "Anualmente" #: common/wdcal_edit.inc.php:214 msgid "days" -msgstr "" +msgstr "días" #: common/wdcal_edit.inc.php:215 msgid "weeks" -msgstr "" +msgstr "semanas" #: common/wdcal_edit.inc.php:216 msgid "months" -msgstr "" +msgstr "meses" #: common/wdcal_edit.inc.php:217 msgid "years" -msgstr "" +msgstr "años" #: common/wdcal_edit.inc.php:218 msgid "Interval" -msgstr "" +msgstr "intervalo" #: common/wdcal_edit.inc.php:218 msgid "All %select% %time%" -msgstr "" +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 "" +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 "" +msgstr "Domingo" #: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274 #: common/wdcal_edit.inc.php:308 msgid "Monday" -msgstr "" +msgstr "Lunes" #: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277 msgid "Tuesday" -msgstr "" +msgstr "Martes" #: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280 msgid "Wednesday" -msgstr "" +msgstr "Miércoles" #: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283 msgid "Thursday" -msgstr "" +msgstr "Jueves" #: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286 msgid "Friday" -msgstr "" +msgstr "Viernes" #: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289 msgid "Saturday" -msgstr "" +msgstr "Sábado" #: common/wdcal_edit.inc.php:297 msgid "First day of week:" -msgstr "" +msgstr "Primer día de la semana:" #: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373 msgid "Day of month" -msgstr "" +msgstr "Día del mes" #: common/wdcal_edit.inc.php:354 msgid "#num#th of each month" -msgstr "" +msgstr "#num#th de cada mes" #: common/wdcal_edit.inc.php:357 msgid "#num#th-last of each month" -msgstr "" +msgstr "#num#th-last de cada mes" #: common/wdcal_edit.inc.php:360 msgid "#num#th #wkday# of each month" -msgstr "" +msgstr "#num#th #wkday# de cada mes" #: common/wdcal_edit.inc.php:363 msgid "#num#th-last #wkday# of each month" -msgstr "" +msgstr "#num#th-last #wkday# de cada mes" #: common/wdcal_edit.inc.php:377 msgid "#num#th of the given month" -msgstr "" +msgstr "#num#th del mes dado" #: common/wdcal_edit.inc.php:380 msgid "#num#th-last of the given month" -msgstr "" +msgstr "#num#th-last del mes dado" #: common/wdcal_edit.inc.php:383 msgid "#num#th #wkday# of the given month" -msgstr "" +msgstr "#num#th #wkday# del mes dado" #: common/wdcal_edit.inc.php:386 msgid "#num#th-last #wkday# of the given month" -msgstr "" +msgstr "#num#th-last #wkday# del mes dado" #: common/wdcal_edit.inc.php:413 msgid "Repeat until" -msgstr "" +msgstr "Repetir hasta" #: common/wdcal_edit.inc.php:417 msgid "Infinite" -msgstr "" +msgstr "Infinito" #: common/wdcal_edit.inc.php:420 msgid "Until the following date" -msgstr "" +msgstr "Hasta la siguiente fecha" #: common/wdcal_edit.inc.php:423 msgid "Number of times" -msgstr "" +msgstr "Número de veces" #: common/wdcal_edit.inc.php:429 msgid "Exceptions" -msgstr "" +msgstr "Excepciones" #: common/wdcal_edit.inc.php:432 msgid "none" -msgstr "" +msgstr "Ninguno" #: common/wdcal_edit.inc.php:449 msgid "Notification" -msgstr "" +msgstr "Notificación" #: common/wdcal_edit.inc.php:466 msgid "Notify by" -msgstr "" +msgstr "Notificar mediante" #: common/wdcal_edit.inc.php:468 msgid "Remove" -msgstr "" +msgstr "Eliminar" #: common/wdcal_edit.inc.php:469 msgid "E-Mail" -msgstr "" +msgstr "E-Mail" #: common/wdcal_edit.inc.php:470 msgid "On Friendica / Display" -msgstr "" +msgstr "El Friendica / Mostrar" #: common/wdcal_edit.inc.php:474 msgid "Time" -msgstr "" +msgstr "Tiempo" #: common/wdcal_edit.inc.php:478 msgid "Hours" -msgstr "" +msgstr "Horas" #: common/wdcal_edit.inc.php:479 msgid "Minutes" -msgstr "" +msgstr "Minutos" #: common/wdcal_edit.inc.php:480 msgid "Seconds" -msgstr "" +msgstr "Segundos" #: common/wdcal_edit.inc.php:482 msgid "Weeks" -msgstr "" +msgstr "Semanas" #: common/wdcal_edit.inc.php:485 msgid "before the" -msgstr "" +msgstr "antes del" #: common/wdcal_edit.inc.php:486 msgid "start of the event" -msgstr "" +msgstr "inicio del evento" #: common/wdcal_edit.inc.php:487 msgid "end of the event" -msgstr "" +msgstr "fin del evento" #: common/wdcal_edit.inc.php:492 msgid "Add a notification" -msgstr "" +msgstr "Añadir una notificación" #: common/wdcal_edit.inc.php:687 msgid "The event #name# will start at #date" -msgstr "" +msgstr "El evento #name# empezará el #date" #: common/wdcal_edit.inc.php:696 msgid "#name# is about to begin." -msgstr "" +msgstr "#name# está a punto de empezar." #: common/wdcal_edit.inc.php:769 msgid "Saved" -msgstr "" +msgstr "Guardado" #: common/wdcal_configuration.php:148 msgid "U.S. Time Format (mm/dd/YYYY)" -msgstr "" +msgstr "EE.UU. Formato de Fecha (mm/dd/YYYY)" #: common/wdcal_configuration.php:243 msgid "German Time Format (dd.mm.YYYY)" -msgstr "" +msgstr "Formato de fecha alemán (dd.mm.YYYY)" #: common/dav_caldav_backend_private.inc.php:39 msgid "Private Events" -msgstr "" +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 "" +msgstr "Sin acceso" #: common/dav_carddav_backend_private.inc.php:46 msgid "Private Addressbooks" -msgstr "" +msgstr "Agenda Privada" diff --git a/dav/lang/es/strings.php b/dav/lang/es/strings.php index 8d60adfe9..5300246ab 100644 --- a/dav/lang/es/strings.php +++ b/dav/lang/es/strings.php @@ -49,93 +49,93 @@ $a->strings["The current version of this plugin has not been set up correctly. P $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: "] = ""; -$a->strings["The database tables have been installed."] = ""; -$a->strings["An error occurred during the installation."] = ""; -$a->strings["The database tables have been updated."] = ""; -$a->strings["An error occurred during the update."] = ""; -$a->strings["No system-wide settings yet."] = ""; -$a->strings["Database status"] = ""; -$a->strings["Installed"] = ""; -$a->strings["Upgrade needed"] = ""; -$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events should 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."] = ""; -$a->strings["Upgrade"] = ""; -$a->strings["Not installed"] = ""; -$a->strings["Install"] = ""; -$a->strings["Unknown"] = ""; -$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."] = ""; -$a->strings["Troubleshooting"] = ""; -$a->strings["Manual creation of the database tables:"] = ""; -$a->strings["Show SQL-statements"] = ""; -$a->strings["Private Calendar"] = ""; -$a->strings["Friendica Events: Mine"] = ""; -$a->strings["Friendica Events: Contacts"] = ""; -$a->strings["Private Addresses"] = ""; -$a->strings["Friendica Contacts"] = ""; -$a->strings["Could not open component for editing"] = ""; -$a->strings["Event data"] = ""; -$a->strings["Special color"] = ""; -$a->strings["Subject"] = ""; -$a->strings["Starts"] = ""; -$a->strings["Ends"] = ""; -$a->strings["Location"] = ""; -$a->strings["Description"] = ""; -$a->strings["Recurrence"] = ""; -$a->strings["Frequency"] = ""; -$a->strings["None"] = ""; -$a->strings["Daily"] = ""; -$a->strings["Weekly"] = ""; -$a->strings["Monthly"] = ""; -$a->strings["Yearly"] = ""; -$a->strings["days"] = ""; -$a->strings["weeks"] = ""; -$a->strings["months"] = ""; -$a->strings["years"] = ""; -$a->strings["Interval"] = ""; -$a->strings["All %select% %time%"] = ""; -$a->strings["Days"] = ""; -$a->strings["Sunday"] = ""; -$a->strings["Monday"] = ""; -$a->strings["Tuesday"] = ""; -$a->strings["Wednesday"] = ""; -$a->strings["Thursday"] = ""; -$a->strings["Friday"] = ""; -$a->strings["Saturday"] = ""; -$a->strings["First day of week:"] = ""; -$a->strings["Day of month"] = ""; -$a->strings["#num#th of each month"] = ""; -$a->strings["#num#th-last of each month"] = ""; -$a->strings["#num#th #wkday# of each month"] = ""; -$a->strings["#num#th-last #wkday# of each month"] = ""; -$a->strings["#num#th of the given month"] = ""; -$a->strings["#num#th-last of the given month"] = ""; -$a->strings["#num#th #wkday# of the given month"] = ""; -$a->strings["#num#th-last #wkday# of the given month"] = ""; -$a->strings["Repeat until"] = ""; -$a->strings["Infinite"] = ""; -$a->strings["Until the following date"] = ""; -$a->strings["Number of times"] = ""; -$a->strings["Exceptions"] = ""; -$a->strings["none"] = ""; -$a->strings["Notification"] = ""; -$a->strings["Notify by"] = ""; -$a->strings["Remove"] = ""; -$a->strings["E-Mail"] = ""; -$a->strings["On Friendica / Display"] = ""; -$a->strings["Time"] = ""; -$a->strings["Hours"] = ""; -$a->strings["Minutes"] = ""; -$a->strings["Seconds"] = ""; -$a->strings["Weeks"] = ""; -$a->strings["before the"] = ""; -$a->strings["start of the event"] = ""; -$a->strings["end of the event"] = ""; -$a->strings["Add a notification"] = ""; -$a->strings["The event #name# will start at #date"] = ""; -$a->strings["#name# is about to begin."] = ""; -$a->strings["Saved"] = ""; -$a->strings["U.S. Time Format (mm/dd/YYYY)"] = ""; -$a->strings["German Time Format (dd.mm.YYYY)"] = ""; -$a->strings["Private Events"] = ""; -$a->strings["No access"] = ""; -$a->strings["Private Addressbooks"] = ""; +$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 should 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 deberían 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"; diff --git a/fromgplus/lang/es/messages.po b/fromgplus/lang/es/messages.po index ac944d6a4..98aa87dc5 100644 --- a/fromgplus/lang/es/messages.po +++ b/fromgplus/lang/es/messages.po @@ -4,14 +4,15 @@ # # # Translators: -# Alberto Díaz Tormo , 2016 +# 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-10-23 13:49+0000\n" -"Last-Translator: Alberto Díaz Tormo \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" @@ -19,22 +20,34 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: fromgplus.php:33 -msgid "Google+ Import Settings" -msgstr "Ajustes de importación de Google+" +#: fromgplus.php:46 fromgplus.php:50 +msgid "Google+ Mirror" +msgstr "Reflector de Google+" -#: fromgplus.php:36 +#: fromgplus.php:55 msgid "Enable Google+ Import" msgstr "Habilitar importación de Google+" -#: fromgplus.php:39 +#: fromgplus.php:58 msgid "Google Account ID" msgstr "ID de cuenta de Google" -#: fromgplus.php:44 -msgid "Submit" -msgstr "Enviar" +#: fromgplus.php:61 +msgid "Add keywords to post" +msgstr "Añadir palabras clave a la entrada" -#: fromgplus.php:59 +#: 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." diff --git a/fromgplus/lang/es/strings.php b/fromgplus/lang/es/strings.php index 3a96b1ac0..c349a4675 100644 --- a/fromgplus/lang/es/strings.php +++ b/fromgplus/lang/es/strings.php @@ -5,8 +5,11 @@ function string_plural_select_es($n){ return ($n != 1);; }} ; -$a->strings["Google+ Import Settings"] = "Ajustes de importación de Google+"; +$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["Submit"] = "Enviar"; +$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."; diff --git a/geonames/lang/es/messages.po b/geonames/lang/es/messages.po new file mode 100644 index 000000000..f372d7925 --- /dev/null +++ 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" diff --git a/geonames/lang/es/strings.php b/geonames/lang/es/strings.php index 885c61978..d9a85aa16 100644 --- a/geonames/lang/es/strings.php +++ b/geonames/lang/es/strings.php @@ -1,6 +1,11 @@ -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"; +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"; diff --git a/gnot/lang/es/messages.po b/gnot/lang/es/messages.po new file mode 100644 index 000000000..b96abe642 --- /dev/null +++ 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" diff --git a/gnot/lang/es/strings.php b/gnot/lang/es/strings.php index 91efb4045..1f114cdb9 100644 --- a/gnot/lang/es/strings.php +++ b/gnot/lang/es/strings.php @@ -1,8 +1,13 @@ -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"; +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"; diff --git a/gpluspost/lang/es/messages.po b/gpluspost/lang/es/messages.po new file mode 100644 index 000000000..c0e50a690 --- /dev/null +++ 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." diff --git a/gravatar/lang/es/messages.po b/gravatar/lang/es/messages.po new file mode 100644 index 000000000..fb1116d20 --- /dev/null +++ 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.
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.
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." diff --git a/gravatar/lang/es/strings.php b/gravatar/lang/es/strings.php index ef1875a0c..a4a247c61 100644 --- a/gravatar/lang/es/strings.php +++ b/gravatar/lang/es/strings.php @@ -1,15 +1,20 @@ -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.
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.
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."; +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.
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.
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."; diff --git a/group_text/lang/es/messages.po b/group_text/lang/es/messages.po new file mode 100644 index 000000000..87bdbe656 --- /dev/null +++ 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" diff --git a/group_text/lang/es/strings.php b/group_text/lang/es/strings.php index d20178c91..9eccc680f 100644 --- a/group_text/lang/es/strings.php +++ b/group_text/lang/es/strings.php @@ -1,5 +1,11 @@ -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"; +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"; diff --git a/ijpost/lang/es/messages.po b/ijpost/lang/es/messages.po new file mode 100644 index 000000000..c4d5c06bf --- /dev/null +++ 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" diff --git a/ijpost/lang/es/strings.php b/ijpost/lang/es/strings.php index 4468be83d..db51f3722 100644 --- a/ijpost/lang/es/strings.php +++ b/ijpost/lang/es/strings.php @@ -1,9 +1,14 @@ -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"; +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"; From 4e92317606d38cc5eb45701be003ccd80b0c1a47 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 17 Nov 2016 07:41:46 +0100 Subject: [PATCH 21/58] DE translation fromgeplus --- fromgplus/lang/de/messages.po | 41 +++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/fromgplus/lang/de/messages.po b/fromgplus/lang/de/messages.po index 6f0ca81d6..87e993e11 100644 --- a/fromgplus/lang/de/messages.po +++ b/fromgplus/lang/de/messages.po @@ -4,37 +4,50 @@ # # # Translators: -# Abrax , 2014 +# Andreas H., 2014 +# Tobias Diekershoff , 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 \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 \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." From 0e14a597b86bc16e786f206ec869af128aa16ab8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 17 Nov 2016 07:53:47 +0100 Subject: [PATCH 22/58] missed a files --- fromgplus/lang/de/strings.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fromgplus/lang/de/strings.php b/fromgplus/lang/de/strings.php index 50f938c52..1aeb4d095 100644 --- 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."; From 631c7724b6cd21f9806f0b08ab36c632b07d155c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Nov 2016 07:57:19 +0100 Subject: [PATCH 23/58] ES translation work THX Albert --- gpluspost/lang/es/strings.php | 19 ++ impressum/lang/es/messages.po | 89 +++++++++ impressum/lang/es/strings.php | 41 ++-- .../lang/es/messages.po | 24 +++ .../lang/es/strings.php | 11 +- irc/lang/es/messages.po | 67 +++++++ irc/lang/es/strings.php | 26 ++- jappixmini/lang/es/messages.po | 77 ++++++++ jappixmini/lang/es/strings.php | 37 ++-- js_upload/lang/es/messages.po | 56 ++++++ js_upload/lang/es/strings.php | 27 +-- libertree/lang/es/messages.po | 48 +++++ libertree/lang/es/strings.php | 23 ++- ljpost/lang/es/messages.po | 48 +++++ ljpost/lang/es/strings.php | 23 ++- mailstream/lang/es/messages.po | 80 ++++++++ mailstream/lang/es/strings.php | 22 +++ mathjax/lang/es/messages.po | 53 ++++++ mathjax/lang/es/strings.php | 23 ++- morepokes/lang/es/messages.po | 167 +++++++++++++++++ morepokes/lang/es/strings.php | 81 ++++---- newmemberwidget/lang/es/messages.po | 76 ++++++++ newmemberwidget/lang/es/strings.php | 20 ++ notimeline/lang/es/messages.po | 36 ++++ notimeline/lang/es/strings.php | 17 +- numfriends/lang/es/messages.po | 36 ++++ numfriends/lang/es/strings.php | 17 +- pageheader/lang/es/messages.po | 32 ++++ pageheader/lang/es/strings.php | 15 +- public_server/lang/es/messages.po | 41 ++++ public_server/lang/es/strings.php | 16 +- pumpio/lang/es/messages.po | 102 ++++++++++ pumpio/lang/es/strings.php | 27 +++ qcomment/lang/es/messages.po | 54 ++++++ qcomment/lang/es/strings.php | 25 ++- randplace/lang/es/messages.po | 32 ++++ randplace/lang/es/strings.php | 15 +- remote_permissions/lang/es/messages.po | 70 +++++++ remote_permissions/lang/es/strings.php | 33 ++-- rendertime/lang/es/messages.po | 27 +++ rendertime/lang/es/strings.php | 10 +- showmore/lang/es/messages.po | 44 +++++ showmore/lang/es/strings.php | 21 ++- smileybutton/lang/es/messages.po | 36 ++++ smileybutton/lang/es/strings.php | 11 ++ snautofollow/lang/es/messages.po | 36 ++++ snautofollow/lang/es/strings.php | 17 +- startpage/lang/es/messages.po | 36 ++++ startpage/lang/es/strings.php | 17 +- statusnet/lang/es/messages.po | 175 ++++++++++++++++++ statusnet/lang/es/strings.php | 72 +++---- 51 files changed, 1981 insertions(+), 227 deletions(-) create mode 100644 gpluspost/lang/es/strings.php create mode 100644 impressum/lang/es/messages.po create mode 100644 infiniteimprobabilitydrive/lang/es/messages.po create mode 100644 irc/lang/es/messages.po create mode 100644 jappixmini/lang/es/messages.po create mode 100644 js_upload/lang/es/messages.po create mode 100644 libertree/lang/es/messages.po create mode 100644 ljpost/lang/es/messages.po create mode 100644 mailstream/lang/es/messages.po create mode 100644 mailstream/lang/es/strings.php create mode 100644 mathjax/lang/es/messages.po create mode 100644 morepokes/lang/es/messages.po create mode 100644 newmemberwidget/lang/es/messages.po create mode 100644 newmemberwidget/lang/es/strings.php create mode 100644 notimeline/lang/es/messages.po create mode 100644 numfriends/lang/es/messages.po create mode 100644 pageheader/lang/es/messages.po create mode 100644 public_server/lang/es/messages.po create mode 100644 pumpio/lang/es/messages.po create mode 100644 pumpio/lang/es/strings.php create mode 100644 qcomment/lang/es/messages.po create mode 100644 randplace/lang/es/messages.po create mode 100644 remote_permissions/lang/es/messages.po create mode 100644 rendertime/lang/es/messages.po create mode 100644 showmore/lang/es/messages.po create mode 100644 smileybutton/lang/es/messages.po create mode 100644 smileybutton/lang/es/strings.php create mode 100644 snautofollow/lang/es/messages.po create mode 100644 startpage/lang/es/messages.po create mode 100644 statusnet/lang/es/messages.po diff --git a/gpluspost/lang/es/strings.php b/gpluspost/lang/es/strings.php new file mode 100644 index 000000000..a9bbedf54 --- /dev/null +++ b/gpluspost/lang/es/strings.php @@ -0,0 +1,19 @@ +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."; diff --git a/impressum/lang/es/messages.po b/impressum/lang/es/messages.po new file mode 100644 index 000000000..0fe87cc56 --- /dev/null +++ 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!
Please add at least the " +"owner variable to your config file. For other variables please " +"refer to the README file of the addon." +msgstr "¡El addon impressum necesita ser configurado!
Por favor añada al menos propietario 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í" diff --git a/impressum/lang/es/strings.php b/impressum/lang/es/strings.php index 19913cf55..fea759eb3 100644 --- a/impressum/lang/es/strings.php +++ b/impressum/lang/es/strings.php @@ -1,18 +1,23 @@ -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!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Impressum necesita ser configurado.
Por favor añade al menos la variable propietario 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."; +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!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "¡El addon impressum necesita ser configurado!
Por favor añada al menos propietario 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í"; diff --git a/infiniteimprobabilitydrive/lang/es/messages.po b/infiniteimprobabilitydrive/lang/es/messages.po new file mode 100644 index 000000000..0ea952a83 --- /dev/null +++ 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" diff --git a/infiniteimprobabilitydrive/lang/es/strings.php b/infiniteimprobabilitydrive/lang/es/strings.php index 9fbaf71c7..7387f4dd4 100644 --- a/infiniteimprobabilitydrive/lang/es/strings.php +++ b/infiniteimprobabilitydrive/lang/es/strings.php @@ -1,3 +1,8 @@ -strings["Infinite Improbability Drive"] = "Unidad de improbabilidad infinita"; +strings["Infinite Improbability Drive"] = "Drive de improbabilidad infinita"; diff --git a/irc/lang/es/messages.po b/irc/lang/es/messages.po new file mode 100644 index 000000000..71599f853 --- /dev/null +++ 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" diff --git a/irc/lang/es/strings.php b/irc/lang/es/strings.php index cadbcbf69..870c53f0a 100644 --- a/irc/lang/es/strings.php +++ b/irc/lang/es/strings.php @@ -1,9 +1,17 @@ -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"; +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"; diff --git a/jappixmini/lang/es/messages.po b/jappixmini/lang/es/messages.po new file mode 100644 index 000000000..4893c8454 --- /dev/null +++ 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 not insert the Jappixmini Chat-Widget into the webinterface" +msgstr "No 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" diff --git a/jappixmini/lang/es/strings.php b/jappixmini/lang/es/strings.php index 9cc5b2931..440ccefdd 100644 --- a/jappixmini/lang/es/strings.php +++ b/jappixmini/lang/es/strings.php @@ -1,16 +1,21 @@ -strings["Jappix Mini addon settings"] = "Ajustes de complemento Jappix Mini"; -$a->strings["Activate addon"] = "Activar complemento"; -$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "No 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"; +strings["Jappix Mini addon settings"] = "Ajustes del addon de Jappix Mini"; +$a->strings["Activate addon"] = "Activar addon"; +$a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "No 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"; diff --git a/js_upload/lang/es/messages.po b/js_upload/lang/es/messages.po new file mode 100644 index 000000000..0b737806f --- /dev/null +++ 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" diff --git a/js_upload/lang/es/strings.php b/js_upload/lang/es/strings.php index 4f0f0ea11..63168e8c3 100644 --- a/js_upload/lang/es/strings.php +++ b/js_upload/lang/es/strings.php @@ -1,11 +1,16 @@ -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"; +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"; diff --git a/libertree/lang/es/messages.po b/libertree/lang/es/messages.po new file mode 100644 index 000000000..8fcc8a8d0 --- /dev/null +++ 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" diff --git a/libertree/lang/es/strings.php b/libertree/lang/es/strings.php index 52d601d74..0be7bbca7 100644 --- a/libertree/lang/es/strings.php +++ b/libertree/lang/es/strings.php @@ -1,9 +1,14 @@ -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"; +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"; diff --git a/ljpost/lang/es/messages.po b/ljpost/lang/es/messages.po new file mode 100644 index 000000000..16efa134f --- /dev/null +++ b/ljpost/lang/es/messages.po @@ -0,0 +1,48 @@ +# ADDON ljpost +# Copyright (C) +# This file is distributed under the same license as the Friendica ljpost 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:17+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" + +#: ljpost.php:39 +msgid "Post to LiveJournal" +msgstr "Publicar en LiveJournal" + +#: ljpost.php:70 +msgid "LiveJournal Post Settings" +msgstr "Ajustes de publicación de LiveJournal" + +#: ljpost.php:72 +msgid "Enable LiveJournal Post Plugin" +msgstr "Habilitar Plugin de publicción de LiveJournal" + +#: ljpost.php:77 +msgid "LiveJournal username" +msgstr "Nombre de usuario de LiveJournal" + +#: ljpost.php:82 +msgid "LiveJournal password" +msgstr "Contraseña de LiveJournal" + +#: ljpost.php:87 +msgid "Post to LiveJournal by default" +msgstr "Publicar en LiveJournal por defecto" + +#: ljpost.php:93 +msgid "Submit" +msgstr "Enviar" diff --git a/ljpost/lang/es/strings.php b/ljpost/lang/es/strings.php index 8273c4719..89e117fbc 100644 --- a/ljpost/lang/es/strings.php +++ b/ljpost/lang/es/strings.php @@ -1,9 +1,14 @@ -strings["Post to LiveJournal"] = "Publicar en Livejournal"; -$a->strings["LiveJournal Post Settings"] = "Configuración de las publicaciones en Livejournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Activar el módulo de publicación en Livejournal"; -$a->strings["LiveJournal username"] = "Nombre de usuario de Livejournal"; -$a->strings["LiveJournal password"] = "Contraseña de Livejournal"; -$a->strings["Post to LiveJournal by default"] = "Publicar en Livejournal por defecto"; -$a->strings["Submit"] = "Envíar"; +strings["Post to LiveJournal"] = "Publicar en LiveJournal"; +$a->strings["LiveJournal Post Settings"] = "Ajustes de publicación de LiveJournal"; +$a->strings["Enable LiveJournal Post Plugin"] = "Habilitar Plugin de publicción de LiveJournal"; +$a->strings["LiveJournal username"] = "Nombre de usuario de LiveJournal"; +$a->strings["LiveJournal password"] = "Contraseña de LiveJournal"; +$a->strings["Post to LiveJournal by default"] = "Publicar en LiveJournal por defecto"; +$a->strings["Submit"] = "Enviar"; diff --git a/mailstream/lang/es/messages.po b/mailstream/lang/es/messages.po new file mode 100644 index 000000000..dd0024033 --- /dev/null +++ b/mailstream/lang/es/messages.po @@ -0,0 +1,80 @@ +# ADDON mailstream +# Copyright (C) +# This file is distributed under the same license as the Friendica mailstream addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2016-11-17 20:21+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" + +#: mailstream.php:55 +msgid "From Address" +msgstr "Desde Dirección" + +#: mailstream.php:57 +msgid "Email address that stream items will appear to be from." +msgstr "Aparecerá de dónde viene la dirección de email que transmite artículos" + +#: mailstream.php:60 mailstream.php:282 +msgid "Save Settings" +msgstr "Guardar ajustes" + +#: mailstream.php:165 +msgid "Re:" +msgstr "Re:" + +#: mailstream.php:173 +msgid "Friendica post" +msgstr "Entrada de Friendica" + +#: mailstream.php:176 +msgid "Diaspora post" +msgstr "Entrada de Diaspora" + +#: mailstream.php:183 +msgid "Feed item" +msgstr "Surtir artículo" + +#: mailstream.php:186 +msgid "Email" +msgstr "Email" + +#: mailstream.php:188 +msgid "Friendica Item" +msgstr "Artículo de Friendica" + +#: mailstream.php:229 +msgid "Upstream" +msgstr "Contracorriente" + +#: mailstream.php:230 +msgid "Local" +msgstr "Local" + +#: mailstream.php:274 +msgid "Email Address" +msgstr "Dirección de email" + +#: mailstream.php:276 +msgid "Leave blank to use your account email address" +msgstr "Dejar en blanco para usar su cuenta de dirección de email" + +#: mailstream.php:279 +msgid "Enabled" +msgstr "Habilitado" + +#: mailstream.php:281 +msgid "Mail Stream Settings" +msgstr "Ajustes de transmisión de Mail" diff --git a/mailstream/lang/es/strings.php b/mailstream/lang/es/strings.php new file mode 100644 index 000000000..8a2a4faf3 --- /dev/null +++ b/mailstream/lang/es/strings.php @@ -0,0 +1,22 @@ +strings["From Address"] = "Desde Dirección"; +$a->strings["Email address that stream items will appear to be from."] = "Aparecerá de dónde viene la dirección de email que transmite artículos"; +$a->strings["Save Settings"] = "Guardar ajustes"; +$a->strings["Re:"] = "Re:"; +$a->strings["Friendica post"] = "Entrada de Friendica"; +$a->strings["Diaspora post"] = "Entrada de Diaspora"; +$a->strings["Feed item"] = "Surtir artículo"; +$a->strings["Email"] = "Email"; +$a->strings["Friendica Item"] = "Artículo de Friendica"; +$a->strings["Upstream"] = "Contracorriente"; +$a->strings["Local"] = "Local"; +$a->strings["Email Address"] = "Dirección de email"; +$a->strings["Leave blank to use your account email address"] = "Dejar en blanco para usar su cuenta de dirección de email"; +$a->strings["Enabled"] = "Habilitado"; +$a->strings["Mail Stream Settings"] = "Ajustes de transmisión de Mail"; diff --git a/mathjax/lang/es/messages.po b/mathjax/lang/es/messages.po new file mode 100644 index 000000000..3b2a284bf --- /dev/null +++ b/mathjax/lang/es/messages.po @@ -0,0 +1,53 @@ +# ADDON mathjax +# Copyright (C) +# This file is distributed under the same license as the Friendica mathjax 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 22:06+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" + +#: mathjax.php:36 +msgid "Settings" +msgstr "Ajustes" + +#: mathjax.php:37 +msgid "" +"The MathJax addon renders mathematical formulae written using the LaTeX " +"syntax surrounded by the usual $$ or an eqnarray block in the postings of " +"your wall,network tab and private mail." +msgstr "El addon MathJax renderiza las fórmulas matemáticos escritas usando la sintaxis LaTeX rodeada por el usual $$ o un bloque eqnarray en las publicaciones de su muro, etiqueta de red y mail privado." + +#: mathjax.php:38 +msgid "Use the MathJax renderer" +msgstr "Usar el renderizador MathJax" + +#: mathjax.php:42 +msgid "Submit" +msgstr "Enviar" + +#: mathjax.php:66 +msgid "Settings updated." +msgstr "Ajustes actualizados." + +#: mathjax.php:75 +msgid "MathJax Base URL" +msgstr "URL Base de MathJax" + +#: mathjax.php:75 +msgid "" +"The URL for the javascript file that should be included to use MathJax. Can " +"be either the MathJax CDN or another installation of MathJax." +msgstr "La URL para el archivo javascript que debería ser incluído para usar MathJax. Puede ser el CDN de MathJax u otra instalación de MathJax." diff --git a/mathjax/lang/es/strings.php b/mathjax/lang/es/strings.php index fe510820a..c2edd566e 100644 --- a/mathjax/lang/es/strings.php +++ b/mathjax/lang/es/strings.php @@ -1,9 +1,14 @@ -strings["Settings"] = "Configuración"; -$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "El complemento MathJax renderiza las fórmulas matemáticas escritas usando la sintaxis de LaTeX rodeadas por el habitual $ $ o un bloque de eqnarray en las publicaciones de tu muro, pestaña de red y correo privado."; -$a->strings["Use the MathJax renderer"] = "Usar renderizado Mathjax"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Settings updated."] = "Configuración actualizada."; -$a->strings["MathJax Base URL"] = "Dirección base de Mathjax"; -$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "La dirección para el archivo javascript debe estar incluida para usar Mathjax. Puede ser Mathjax CDN o cualquier otra instalación de Mathjax."; +strings["Settings"] = "Ajustes"; +$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "El addon MathJax renderiza las fórmulas matemáticos escritas usando la sintaxis LaTeX rodeada por el usual $$ o un bloque eqnarray en las publicaciones de su muro, etiqueta de red y mail privado."; +$a->strings["Use the MathJax renderer"] = "Usar el renderizador MathJax"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Settings updated."] = "Ajustes actualizados."; +$a->strings["MathJax Base URL"] = "URL Base de MathJax"; +$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "La URL para el archivo javascript que debería ser incluído para usar MathJax. Puede ser el CDN de MathJax u otra instalación de MathJax."; diff --git a/morepokes/lang/es/messages.po b/morepokes/lang/es/messages.po new file mode 100644 index 000000000..c094b126b --- /dev/null +++ b/morepokes/lang/es/messages.po @@ -0,0 +1,167 @@ +# ADDON morepokes +# Copyright (C) +# This file is distributed under the same license as the Friendica morepokes 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: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" + +#: morepokes.php:19 +msgid "bitchslap" +msgstr "bofetada" + +#: morepokes.php:19 +msgid "bitchslapped" +msgstr "abofeteó" + +#: morepokes.php:20 +msgid "shag" +msgstr "atrapar" + +#: morepokes.php:20 +msgid "shagged" +msgstr "atrapó" + +#: morepokes.php:21 +msgid "do something obscenely biological to" +msgstr "hacer algo obscenamente biológico a" + +#: morepokes.php:21 +msgid "did something obscenely biological to" +msgstr "hizo algo obscenamente biológico a" + +#: morepokes.php:22 +msgid "point out the poke feature to" +msgstr "señalar la presentación de empuje a" + +#: morepokes.php:22 +msgid "pointed out the poke feature to" +msgstr "señaló la presentación de empuje a" + +#: morepokes.php:23 +msgid "declare undying love for" +msgstr "declarar amor eterno a" + +#: morepokes.php:23 +msgid "declared undying love for" +msgstr "declaró amor eterno a" + +#: morepokes.php:24 +msgid "patent" +msgstr "padres" + +#: morepokes.php:24 +msgid "patented" +msgstr "emparentado" + +#: morepokes.php:25 +msgid "stroke beard" +msgstr "acariciar barba" + +#: morepokes.php:25 +msgid "stroked their beard at" +msgstr "acarició la barba a" + +#: morepokes.php:26 +msgid "" +"bemoan the declining standards of modern secondary and tertiary education to" +msgstr "lamentar los estándares en declive de la educación secundaria y terciaria modernas a" + +#: morepokes.php:26 +msgid "" +"bemoans the declining standards of modern secondary and tertiary education " +"to" +msgstr "lamenta los estándares en declive de la educación secundaria y terciaria modernas a" + +#: morepokes.php:27 +msgid "hug" +msgstr "abrazar" + +#: morepokes.php:27 +msgid "hugged" +msgstr "abrazó" + +#: morepokes.php:28 +msgid "kiss" +msgstr "beso" + +#: morepokes.php:28 +msgid "kissed" +msgstr "besó" + +#: morepokes.php:29 +msgid "raise eyebrows at" +msgstr "levantar cejas a" + +#: morepokes.php:29 +msgid "raised their eyebrows at" +msgstr "le levantó las cejas a" + +#: morepokes.php:30 +msgid "insult" +msgstr "insultar" + +#: morepokes.php:30 +msgid "insulted" +msgstr "insultado" + +#: morepokes.php:31 +msgid "praise" +msgstr "elogiar" + +#: morepokes.php:31 +msgid "praised" +msgstr "elogiado" + +#: morepokes.php:32 +msgid "be dubious of" +msgstr "dudar de" + +#: morepokes.php:32 +msgid "was dubious of" +msgstr "dudó de" + +#: morepokes.php:33 +msgid "eat" +msgstr "comer" + +#: morepokes.php:33 +msgid "ate" +msgstr "comido" + +#: morepokes.php:34 +msgid "giggle and fawn at" +msgstr "risita y adular a" + +#: morepokes.php:34 +msgid "giggled and fawned at" +msgstr "rió y aduló a" + +#: morepokes.php:35 +msgid "doubt" +msgstr "dudar" + +#: morepokes.php:35 +msgid "doubted" +msgstr "dudó" + +#: morepokes.php:36 +msgid "glare" +msgstr "mirar con furia" + +#: morepokes.php:36 +msgid "glared at" +msgstr "miró con furia a" diff --git a/morepokes/lang/es/strings.php b/morepokes/lang/es/strings.php index dc307fc6e..345427f65 100644 --- a/morepokes/lang/es/strings.php +++ b/morepokes/lang/es/strings.php @@ -1,38 +1,43 @@ -strings["bitchslap"] = "abofetear fuerte"; -$a->strings["bitchslapped"] = "abofeteó fuertemente a"; -$a->strings["shag"] = "picar"; -$a->strings["shagged"] = "picó a"; -$a->strings["do something obscenely biological to"] = "hacer algo obsceno y biológico a"; -$a->strings["did something obscenely biological to"] = "hizo algo obsceno y biológico a"; -$a->strings["point out the poke feature to"] = "señalar la habilidad de toques a"; -$a->strings["pointed out the poke feature to"] = "señaló la habilidad de toques a"; -$a->strings["declare undying love for"] = "declarar amor incondicional a"; -$a->strings["declared undying love for"] = "declaró amor incondicional a"; -$a->strings["patent"] = "patentar"; -$a->strings["patented"] = "patentó"; -$a->strings["stroke beard"] = "acariciar barba"; -$a->strings["stroked their beard at"] = "acarició su barba a"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplorar los bajos estándares de educación secundaria y terciaria moderna a"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplora los bajos estándares de educación secundaria y terciaria moderna a"; -$a->strings["hug"] = "abrazar"; -$a->strings["hugged"] = "abrazó a"; -$a->strings["kiss"] = "besar"; -$a->strings["kissed"] = "besó a"; -$a->strings["raise eyebrows at"] = "alzar las cejas a"; -$a->strings["raised their eyebrows at"] = "alzó sus cejas a"; -$a->strings["insult"] = "insultar"; -$a->strings["insulted"] = "insultó a"; -$a->strings["praise"] = "alabar"; -$a->strings["praised"] = "alabó a"; -$a->strings["be dubious of"] = "dudar de"; -$a->strings["was dubious of"] = "dudó de"; -$a->strings["eat"] = "comer"; -$a->strings["ate"] = "comió"; -$a->strings["giggle and fawn at"] = "reír y carcajearse de"; -$a->strings["giggled and fawned at"] = "rió y se carcajeó de"; -$a->strings["doubt"] = "dudar"; -$a->strings["doubted"] = "dudó"; -$a->strings["glare"] = "mirar fijamente"; -$a->strings["glared at"] = "miró fijamente a"; +strings["bitchslap"] = "bofetada"; +$a->strings["bitchslapped"] = "abofeteó"; +$a->strings["shag"] = "atrapar"; +$a->strings["shagged"] = "atrapó"; +$a->strings["do something obscenely biological to"] = "hacer algo obscenamente biológico a"; +$a->strings["did something obscenely biological to"] = "hizo algo obscenamente biológico a"; +$a->strings["point out the poke feature to"] = "señalar la presentación de empuje a"; +$a->strings["pointed out the poke feature to"] = "señaló la presentación de empuje a"; +$a->strings["declare undying love for"] = "declarar amor eterno a"; +$a->strings["declared undying love for"] = "declaró amor eterno a"; +$a->strings["patent"] = "padres"; +$a->strings["patented"] = "emparentado"; +$a->strings["stroke beard"] = "acariciar barba"; +$a->strings["stroked their beard at"] = "acarició la barba a"; +$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "lamentar los estándares en declive de la educación secundaria y terciaria modernas a"; +$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "lamenta los estándares en declive de la educación secundaria y terciaria modernas a"; +$a->strings["hug"] = "abrazar"; +$a->strings["hugged"] = "abrazó"; +$a->strings["kiss"] = "beso"; +$a->strings["kissed"] = "besó"; +$a->strings["raise eyebrows at"] = "levantar cejas a"; +$a->strings["raised their eyebrows at"] = "le levantó las cejas a"; +$a->strings["insult"] = "insultar"; +$a->strings["insulted"] = "insultado"; +$a->strings["praise"] = "elogiar"; +$a->strings["praised"] = "elogiado"; +$a->strings["be dubious of"] = "dudar de"; +$a->strings["was dubious of"] = "dudó de"; +$a->strings["eat"] = "comer"; +$a->strings["ate"] = "comido"; +$a->strings["giggle and fawn at"] = "risita y adular a"; +$a->strings["giggled and fawned at"] = "rió y aduló a"; +$a->strings["doubt"] = "dudar"; +$a->strings["doubted"] = "dudó"; +$a->strings["glare"] = "mirar con furia"; +$a->strings["glared at"] = "miró con furia a"; diff --git a/newmemberwidget/lang/es/messages.po b/newmemberwidget/lang/es/messages.po new file mode 100644 index 000000000..e46b6f472 --- /dev/null +++ b/newmemberwidget/lang/es/messages.po @@ -0,0 +1,76 @@ +# ADDON newmemberwidget +# Copyright (C) +# This file is distributed under the same license as the Friendica newmemberwidget addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-01 14:12+0200\n" +"PO-Revision-Date: 2016-11-17 20: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" + +#: newmemberwidget.php:21 +msgid "New Member" +msgstr "Nuevo Miembro" + +#: newmemberwidget.php:22 +msgid "Tips for New Members" +msgstr "Consejos para Nuevos Miembros" + +#: newmemberwidget.php:24 +msgid "Global Support Forum" +msgstr "Foro de Soporte Global" + +#: newmemberwidget.php:26 +msgid "Local Support Forum" +msgstr "Foro de Soporte Local" + +#: newmemberwidget.php:49 +msgid "Save Settings" +msgstr "Guardar Ajustes" + +#: newmemberwidget.php:50 +msgid "Message" +msgstr "Mensaje" + +#: newmemberwidget.php:50 +msgid "Your message for new members. You can use bbcode here." +msgstr "Su mensaje para los nuevos miembros. Puede usar bbcode aquí" + +#: newmemberwidget.php:51 +msgid "Add a link to global support forum" +msgstr "Añadir un enlace al foro de soporte global" + +#: newmemberwidget.php:51 +msgid "Should a link to the global support forum be displayed?" +msgstr "¿Debería mostrarse un enlace al foro de soporte global?" + +#: newmemberwidget.php:52 +msgid "Add a link to the local support forum" +msgstr "Añadir un enlace al foro de soporte local" + +#: newmemberwidget.php:52 +msgid "" +"If you have a local support forum and wand to have a link displayed in the " +"widget, check this box." +msgstr "Si tiene un foro de soporte local y quiere que se muestre un enlace en el widget, chequee esta casilla." + +#: newmemberwidget.php:53 +msgid "Name of the local support group" +msgstr "Nombre del grupo de soporte local" + +#: newmemberwidget.php:53 +msgid "" +"If you checked the above, specify the nickname of the local support" +" group here (i.e. helpers)" +msgstr "Si chequeó arriba, especifique el apodo del grupo de soporte local aquí (asistentes)" diff --git a/newmemberwidget/lang/es/strings.php b/newmemberwidget/lang/es/strings.php new file mode 100644 index 000000000..de5df04f1 --- /dev/null +++ b/newmemberwidget/lang/es/strings.php @@ -0,0 +1,20 @@ +strings["New Member"] = "Nuevo Miembro"; +$a->strings["Tips for New Members"] = "Consejos para Nuevos Miembros"; +$a->strings["Global Support Forum"] = "Foro de Soporte Global"; +$a->strings["Local Support Forum"] = "Foro de Soporte Local"; +$a->strings["Save Settings"] = "Guardar Ajustes"; +$a->strings["Message"] = "Mensaje"; +$a->strings["Your message for new members. You can use bbcode here."] = "Su mensaje para los nuevos miembros. Puede usar bbcode aquí"; +$a->strings["Add a link to global support forum"] = "Añadir un enlace al foro de soporte global"; +$a->strings["Should a link to the global support forum be displayed?"] = "¿Debería mostrarse un enlace al foro de soporte global?"; +$a->strings["Add a link to the local support forum"] = "Añadir un enlace al foro de soporte local"; +$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Si tiene un foro de soporte local y quiere que se muestre un enlace en el widget, chequee esta casilla."; +$a->strings["Name of the local support group"] = "Nombre del grupo de soporte local"; +$a->strings["If you checked the above, specify the nickname of the local support group here (i.e. helpers)"] = "Si chequeó arriba, especifique el apodo del grupo de soporte local aquí (asistentes)"; diff --git a/notimeline/lang/es/messages.po b/notimeline/lang/es/messages.po new file mode 100644 index 000000000..bd69aa60a --- /dev/null +++ b/notimeline/lang/es/messages.po @@ -0,0 +1,36 @@ +# ADDON notimeline +# Copyright (C) +# This file is distributed under the same license as the Friendica notimeline 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 22:07+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" + +#: notimeline.php:32 +msgid "No Timeline settings updated." +msgstr "Ningún ajuste de Línea de Tiempo actualizado" + +#: notimeline.php:56 +msgid "No Timeline Settings" +msgstr "No hay ajustes de Línea de Tiempo" + +#: notimeline.php:58 +msgid "Disable Archive selector on profile wall" +msgstr "Deshabilitar el selector Archivo en el muro de perfil" + +#: notimeline.php:64 +msgid "Submit" +msgstr "Enviar" diff --git a/notimeline/lang/es/strings.php b/notimeline/lang/es/strings.php index 050b12a8a..ec69f6ff7 100644 --- a/notimeline/lang/es/strings.php +++ b/notimeline/lang/es/strings.php @@ -1,6 +1,11 @@ -strings["No Timeline settings updated."] = "Configuración Sin Linea Temporal actualizada."; -$a->strings["No Timeline Settings"] = "Configuración Sin Linea Temporal"; -$a->strings["Disable Archive selector on profile wall"] = "Desactivar el selector de archivos en el muro del perfil"; -$a->strings["Submit"] = "Envíar"; +strings["No Timeline settings updated."] = "Ningún ajuste de Línea de Tiempo actualizado"; +$a->strings["No Timeline Settings"] = "No hay ajustes de Línea de Tiempo"; +$a->strings["Disable Archive selector on profile wall"] = "Deshabilitar el selector Archivo en el muro de perfil"; +$a->strings["Submit"] = "Enviar"; diff --git a/numfriends/lang/es/messages.po b/numfriends/lang/es/messages.po new file mode 100644 index 000000000..d5ef14646 --- /dev/null +++ b/numfriends/lang/es/messages.po @@ -0,0 +1,36 @@ +# ADDON numfriends +# Copyright (C) +# This file is distributed under the same license as the Friendica numfriends 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 22:08+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" + +#: numfriends.php:46 +msgid "Numfriends settings updated." +msgstr "Ajustes de Numfriends actualizados." + +#: numfriends.php:77 +msgid "Numfriends Settings" +msgstr "Ajustes de Numfriends" + +#: numfriends.php:79 +msgid "How many contacts to display on profile sidebar" +msgstr "Cuántos contactos mostrar en la barra lateral del perfil" + +#: numfriends.php:85 +msgid "Submit" +msgstr "Enviar" diff --git a/numfriends/lang/es/strings.php b/numfriends/lang/es/strings.php index 3a84bd3d6..a06fbcf36 100644 --- a/numfriends/lang/es/strings.php +++ b/numfriends/lang/es/strings.php @@ -1,6 +1,11 @@ -strings["Numfriends settings updated."] = "Configuración del Contador de contactos actualizada"; -$a->strings["Numfriends Settings"] = "Configuración del Contador de contactos"; -$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?"; -$a->strings["Submit"] = "Envíar"; +strings["Numfriends settings updated."] = "Ajustes de Numfriends actualizados."; +$a->strings["Numfriends Settings"] = "Ajustes de Numfriends"; +$a->strings["How many contacts to display on profile sidebar"] = "Cuántos contactos mostrar en la barra lateral del perfil"; +$a->strings["Submit"] = "Enviar"; diff --git a/pageheader/lang/es/messages.po b/pageheader/lang/es/messages.po new file mode 100644 index 000000000..baf5c7422 --- /dev/null +++ b/pageheader/lang/es/messages.po @@ -0,0 +1,32 @@ +# ADDON pageheader +# Copyright (C) +# This file is distributed under the same license as the Friendica pageheader 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 22:09+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" + +#: pageheader.php:50 +msgid "\"pageheader\" Settings" +msgstr "Ajustes de \"pageheader\"" + +#: pageheader.php:55 +msgid "Submit" +msgstr "Enviar" + +#: pageheader.php:68 +msgid "pageheader Settings saved." +msgstr "Ajustes de pageheader actualizados." diff --git a/pageheader/lang/es/strings.php b/pageheader/lang/es/strings.php index f8a07aac9..254c0f6a7 100644 --- a/pageheader/lang/es/strings.php +++ b/pageheader/lang/es/strings.php @@ -1,5 +1,10 @@ -strings["\"pageheader\" Settings"] = "Configuración de cabecera"; -$a->strings["Submit"] = "Envíar"; -$a->strings["pageheader Settings saved."] = "Configuración de cabecera de página guardada."; +strings["\"pageheader\" Settings"] = "Ajustes de \"pageheader\""; +$a->strings["Submit"] = "Enviar"; +$a->strings["pageheader Settings saved."] = "Ajustes de pageheader actualizados."; diff --git a/public_server/lang/es/messages.po b/public_server/lang/es/messages.po new file mode 100644 index 000000000..12d8cef67 --- /dev/null +++ b/public_server/lang/es/messages.po @@ -0,0 +1,41 @@ +# ADDON public_server +# Copyright (C) +# This file is distributed under the same license as the Friendica public_server 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 22:12+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" + +#: public_server.php:62 +msgid "Administrator" +msgstr "Administrador" + +#: public_server.php:126 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "Su cuenta de %s expirará en unos días." + +#: public_server.php:127 +msgid "Your Friendica account is about to expire." +msgstr "Su cuenta de Friendica está a punto de expirar." + +#: public_server.php:128 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days" +msgstr "Hola %1$s,\n\nSu cuenta de %2$s expirará en menos de cinco días. Puede conservar su cuenta iniciando sesión al menos una vez cada 30 días" diff --git a/public_server/lang/es/strings.php b/public_server/lang/es/strings.php index ceb046dc3..fa1db55a4 100644 --- a/public_server/lang/es/strings.php +++ b/public_server/lang/es/strings.php @@ -1,5 +1,11 @@ -strings["Administrator"] = "Administrador"; -$a->strings["Your account on %s will expire in a few days."] = "Tu cuenta de %s expirará en pocos días."; -$a->strings["Your Friendica account is about to expire."] = "Tu cuenta de Friendica está a punto de expirar."; +strings["Administrator"] = "Administrador"; +$a->strings["Your account on %s will expire in a few days."] = "Su cuenta de %s expirará en unos días."; +$a->strings["Your Friendica account is about to expire."] = "Su cuenta de Friendica está a punto de expirar."; +$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hola %1\$s,\n\nSu cuenta de %2\$s expirará en menos de cinco días. Puede conservar su cuenta iniciando sesión al menos una vez cada 30 días"; diff --git a/pumpio/lang/es/messages.po b/pumpio/lang/es/messages.po new file mode 100644 index 000000000..dd3816264 --- /dev/null +++ b/pumpio/lang/es/messages.po @@ -0,0 +1,102 @@ +# ADDON pumpio +# Copyright (C) +# This file is distributed under the same license as the Friendica pumpio addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2016-11-17 22:20+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" + +#: pumpio.php:38 +msgid "Permission denied." +msgstr "Permiso denegado." + +#: pumpio.php:124 +#, php-format +msgid "Unable to register the client at the pump.io server '%s'." +msgstr "Imposible registrar el cliente en el servidor '%s' de pump.io." + +#: pumpio.php:164 +msgid "You are now authenticated to pumpio." +msgstr "Ahora está autenticado en Pump.io." + +#: pumpio.php:165 +msgid "return to the connector page" +msgstr "volver a la página del conector" + +#: pumpio.php:183 +msgid "Post to pumpio" +msgstr "Publicar en Pump.io" + +#: pumpio.php:221 pumpio.php:225 +msgid "Pump.io Import/Export/Mirror" +msgstr "Importar/Exportar/Reflejar Pump.io" + +#: pumpio.php:229 +msgid "pump.io username (without the servername)" +msgstr "Nombre de usuario de Pump.io (sin el nombre de servidor)" + +#: pumpio.php:234 +msgid "pump.io servername (without \"http://\" or \"https://\" )" +msgstr "Nombre de servidor de Pump.io (sin \"http://\" o \"https://\" )" + +#: pumpio.php:246 +msgid "Authenticate your pump.io connection" +msgstr "Autenticar su conexión de Pump.io" + +#: pumpio.php:250 +msgid "Import the remote timeline" +msgstr "Importar la línea de tiempo remota" + +#: pumpio.php:255 +msgid "Enable pump.io Post Plugin" +msgstr "Habilitar Plugin de publicación de Pump.io" + +#: pumpio.php:260 +msgid "Post to pump.io by default" +msgstr "Publicar en Pump.io por defecto" + +#: pumpio.php:265 +msgid "Should posts be public?" +msgstr "¿Deberían de ser públicas las entradas?" + +#: pumpio.php:270 +msgid "Mirror all public posts" +msgstr "Reflejar todas las entradas públicas" + +#: pumpio.php:275 +msgid "Check to delete this preset" +msgstr "Chequear para eliminar este preajuste" + +#: pumpio.php:285 +msgid "Save Settings" +msgstr "Guardar Ajustes" + +#: pumpio.php:515 +msgid "Pump.io post failed. Queued for retry." +msgstr "Falló la publicación de Pump.io. En cola para reintentar." + +#: pumpio.php:587 +msgid "Pump.io like failed. Queued for retry." +msgstr "Falló el Like de Pump.io. En cola para reintentar." + +#: pumpio.php:875 +msgid "status" +msgstr "estado" + +#: pumpio.php:879 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "A %1$s le gustan los %3$s de %2$s" diff --git a/pumpio/lang/es/strings.php b/pumpio/lang/es/strings.php new file mode 100644 index 000000000..8f0a8bfb3 --- /dev/null +++ b/pumpio/lang/es/strings.php @@ -0,0 +1,27 @@ +strings["Permission denied."] = "Permiso denegado."; +$a->strings["Unable to register the client at the pump.io server '%s'."] = "Imposible registrar el cliente en el servidor '%s' de pump.io."; +$a->strings["You are now authenticated to pumpio."] = "Ahora está autenticado en Pump.io."; +$a->strings["return to the connector page"] = "volver a la página del conector"; +$a->strings["Post to pumpio"] = "Publicar en Pump.io"; +$a->strings["Pump.io Import/Export/Mirror"] = "Importar/Exportar/Reflejar Pump.io"; +$a->strings["pump.io username (without the servername)"] = "Nombre de usuario de Pump.io (sin el nombre de servidor)"; +$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nombre de servidor de Pump.io (sin \"http://\" o \"https://\" )"; +$a->strings["Authenticate your pump.io connection"] = "Autenticar su conexión de Pump.io"; +$a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota"; +$a->strings["Enable pump.io Post Plugin"] = "Habilitar Plugin de publicación de Pump.io"; +$a->strings["Post to pump.io by default"] = "Publicar en Pump.io por defecto"; +$a->strings["Should posts be public?"] = "¿Deberían de ser públicas las entradas?"; +$a->strings["Mirror all public posts"] = "Reflejar todas las entradas públicas"; +$a->strings["Check to delete this preset"] = "Chequear para eliminar este preajuste"; +$a->strings["Save Settings"] = "Guardar Ajustes"; +$a->strings["Pump.io post failed. Queued for retry."] = "Falló la publicación de Pump.io. En cola para reintentar."; +$a->strings["Pump.io like failed. Queued for retry."] = "Falló el Like de Pump.io. En cola para reintentar."; +$a->strings["status"] = "estado"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gustan los %3\$s de %2\$s"; diff --git a/qcomment/lang/es/messages.po b/qcomment/lang/es/messages.po new file mode 100644 index 000000000..ddf801286 --- /dev/null +++ b/qcomment/lang/es/messages.po @@ -0,0 +1,54 @@ +# ADDON qcomment +# Copyright (C) +# This file is distributed under the same license as the Friendica qcomment 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 22:22+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" + +#: qcomment.php:51 +msgid ":-)" +msgstr ":-)" + +#: qcomment.php:51 +msgid ":-(" +msgstr ":-(" + +#: qcomment.php:51 +msgid "lol" +msgstr "LOL" + +#: qcomment.php:54 +msgid "Quick Comment Settings" +msgstr "Ajustes de Comentario Rápido" + +#: qcomment.php:56 +msgid "" +"Quick comments are found near comment boxes, sometimes hidden. Click them to" +" provide simple replies." +msgstr "Los comentarios rápidos están junto a las cajas de comentario, a veces ocultos. Click sobre ellos para proveer respuestas simples." + +#: qcomment.php:57 +msgid "Enter quick comments, one per line" +msgstr "Introducir comentarios rápidos, uno por línea" + +#: qcomment.php:61 +msgid "Submit" +msgstr "Enviar" + +#: qcomment.php:75 +msgid "Quick Comment settings saved." +msgstr "Ajustes de Comentario Rápido guardados." diff --git a/qcomment/lang/es/strings.php b/qcomment/lang/es/strings.php index b68876c4d..ce1e3bf19 100644 --- a/qcomment/lang/es/strings.php +++ b/qcomment/lang/es/strings.php @@ -1,10 +1,15 @@ -strings[":-)"] = ":-)"; -$a->strings[":-("] = ":-("; -$a->strings["lol"] = "XD"; -$a->strings["Quick Comment Settings"] = "Configuración de Qcomment"; -$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Qcomments son comentarios rápidos que se encuentran cerca del cuadro de texto, a veces ocultos. Pulsa en ellos para dar respuestas simples."; -$a->strings["Enter quick comments, one per line"] = "Introduce comentarios rápidos, uno por línea"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Quick Comment settings saved."] = "Configuración de Qcomment guardada."; +strings[":-)"] = ":-)"; +$a->strings[":-("] = ":-("; +$a->strings["lol"] = "LOL"; +$a->strings["Quick Comment Settings"] = "Ajustes de Comentario Rápido"; +$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Los comentarios rápidos están junto a las cajas de comentario, a veces ocultos. Click sobre ellos para proveer respuestas simples."; +$a->strings["Enter quick comments, one per line"] = "Introducir comentarios rápidos, uno por línea"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Quick Comment settings saved."] = "Ajustes de Comentario Rápido guardados."; diff --git a/randplace/lang/es/messages.po b/randplace/lang/es/messages.po new file mode 100644 index 000000000..0b63aa17b --- /dev/null +++ b/randplace/lang/es/messages.po @@ -0,0 +1,32 @@ +# ADDON randplace +# Copyright (C) +# This file is distributed under the same license as the Friendica randplace 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 22:23+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" + +#: randplace.php:169 +msgid "Randplace Settings" +msgstr "Ajustes de Randplace" + +#: randplace.php:171 +msgid "Enable Randplace Plugin" +msgstr "Habilitar el Plugin de Randplace" + +#: randplace.php:177 +msgid "Submit" +msgstr "Enviar" diff --git a/randplace/lang/es/strings.php b/randplace/lang/es/strings.php index 46139f5cd..716845ac6 100644 --- a/randplace/lang/es/strings.php +++ b/randplace/lang/es/strings.php @@ -1,5 +1,10 @@ -strings["Randplace Settings"] = "Configuración de Randplace"; -$a->strings["Enable Randplace Plugin"] = "Activar el módulo de lugar aleatorio Randplace"; -$a->strings["Submit"] = "Envíar"; +strings["Randplace Settings"] = "Ajustes de Randplace"; +$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace"; +$a->strings["Submit"] = "Enviar"; diff --git a/remote_permissions/lang/es/messages.po b/remote_permissions/lang/es/messages.po new file mode 100644 index 000000000..a47fb5753 --- /dev/null +++ b/remote_permissions/lang/es/messages.po @@ -0,0 +1,70 @@ +# ADDON remote_permissions +# Copyright (C) +# This file is distributed under the same license as the Friendica remote_permissions 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 22:30+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" + +#: remote_permissions.php:45 +msgid "Remote Permissions Settings" +msgstr "Ajustes de Permisos Remotos" + +#: remote_permissions.php:46 +msgid "" +"Allow recipients of your private posts to see the other recipients of the " +"posts" +msgstr "Permitir a los destinatarios de sus publicaciones privadas ver a los otros destinatarios de sus publicaciones" + +#: remote_permissions.php:48 remote_permissions.php:196 +msgid "Submit" +msgstr "Enviar" + +#: remote_permissions.php:58 +msgid "Remote Permissions settings updated." +msgstr "Ajustes de Permisos Remotos actualizados." + +#: remote_permissions.php:124 +msgid "Visible to:" +msgstr "Visible para:" + +#: remote_permissions.php:178 +msgid "Visible to" +msgstr "Visible para" + +#: remote_permissions.php:178 +msgid "may only be a partial list" +msgstr "puede ser sólo una lista parcial" + +#: remote_permissions.php:197 +msgid "Global" +msgstr "Global" + +#: remote_permissions.php:197 +msgid "The posts of every user on this server show the post recipients" +msgstr "Las entradas de cada usuario de este servidor muestran a los destinatarios de la entrada" + +#: remote_permissions.php:198 +msgid "Individual" +msgstr "Individuo" + +#: remote_permissions.php:198 +msgid "Each user chooses whether his/her posts show the post recipients" +msgstr "Cada usuario elige si sus entradas muestran a los destinatarios de la entrada" + +#: remote_permissions.php:205 +msgid "Settings updated." +msgstr "Ajustes actualizados." diff --git a/remote_permissions/lang/es/strings.php b/remote_permissions/lang/es/strings.php index c9ad5811e..6a3d42f0c 100644 --- a/remote_permissions/lang/es/strings.php +++ b/remote_permissions/lang/es/strings.php @@ -1,14 +1,19 @@ -strings["Remote Permissions Settings"] = ""; -$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = ""; -$a->strings["Submit"] = "Envíar"; -$a->strings["Remote Permissions settings updated."] = ""; -$a->strings["Visible to:"] = "Visible para:"; -$a->strings["Visible to"] = ""; -$a->strings["may only be a partial list"] = ""; -$a->strings["Global"] = ""; -$a->strings["The posts of every user on this server show the post recipients"] = ""; -$a->strings["Individual"] = ""; -$a->strings["Each user chooses whether his/her posts show the post recipients"] = ""; -$a->strings["Settings updated."] = "Configuración actualizada."; +strings["Remote Permissions Settings"] = "Ajustes de Permisos Remotos"; +$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Permitir a los destinatarios de sus publicaciones privadas ver a los otros destinatarios de sus publicaciones"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Remote Permissions settings updated."] = "Ajustes de Permisos Remotos actualizados."; +$a->strings["Visible to:"] = "Visible para:"; +$a->strings["Visible to"] = "Visible para"; +$a->strings["may only be a partial list"] = "puede ser sólo una lista parcial"; +$a->strings["Global"] = "Global"; +$a->strings["The posts of every user on this server show the post recipients"] = "Las entradas de cada usuario de este servidor muestran a los destinatarios de la entrada"; +$a->strings["Individual"] = "Individuo"; +$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Cada usuario elige si sus entradas muestran a los destinatarios de la entrada"; +$a->strings["Settings updated."] = "Ajustes actualizados."; diff --git a/rendertime/lang/es/messages.po b/rendertime/lang/es/messages.po new file mode 100644 index 000000000..b672e0a83 --- /dev/null +++ b/rendertime/lang/es/messages.po @@ -0,0 +1,27 @@ +# ADDON rendertime +# Copyright (C) +# This file is distributed under the same license as the Friendica rendertime 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 22:31+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" + +#: rendertime.php:29 +#, php-format +msgid "" +"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, " +"Other: %s, Total: %s" +msgstr "Cumplimiento: Base de datos: %s, Red: %s, Renderizado: %s, Analizador: %s, I/O: %s, Otro: %s, Total: %s" diff --git a/rendertime/lang/es/strings.php b/rendertime/lang/es/strings.php index ab4fa67a0..1cd57a0b0 100644 --- a/rendertime/lang/es/strings.php +++ b/rendertime/lang/es/strings.php @@ -1,2 +1,8 @@ -strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Cumplimiento: Base de datos: %s, Red: %s, Renderizado: %s, Analizador: %s, I/O: %s, Otro: %s, Total: %s"; diff --git a/showmore/lang/es/messages.po b/showmore/lang/es/messages.po new file mode 100644 index 000000000..56744631b --- /dev/null +++ b/showmore/lang/es/messages.po @@ -0,0 +1,44 @@ +# ADDON showmore +# Copyright (C) +# This file is distributed under the same license as the Friendica showmore 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 22:32+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" + +#: showmore.php:38 +msgid "\"Show more\" Settings" +msgstr "Ajustes de \"Mostrar más\"" + +#: showmore.php:41 +msgid "Enable Show More" +msgstr "Habilitar Mostrar Más" + +#: showmore.php:44 +msgid "Cutting posts after how much characters" +msgstr "Cortar entradas después de tantos carácteres" + +#: showmore.php:48 +msgid "Submit" +msgstr "Enviar" + +#: showmore.php:65 +msgid "Show More Settings saved." +msgstr "Ajustes de Mostrar Más guardados." + +#: showmore.php:119 +msgid "show more" +msgstr "mostrar más" diff --git a/showmore/lang/es/strings.php b/showmore/lang/es/strings.php index d6a5d1566..16ceaf564 100644 --- a/showmore/lang/es/strings.php +++ b/showmore/lang/es/strings.php @@ -1,8 +1,13 @@ -strings["\"Show more\" Settings"] = "Configuración de \"Muéstrame más\""; -$a->strings["Enable Show More"] = "Activar Muéstrame más"; -$a->strings["Cutting posts after how much characters"] = "Cortar las publicaciones después de cuántos caracteres"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Show More Settings saved."] = "Configuración de Muéstrame más guardada."; -$a->strings["show more"] = "ver más"; +strings["\"Show more\" Settings"] = "Ajustes de \"Mostrar más\""; +$a->strings["Enable Show More"] = "Habilitar Mostrar Más"; +$a->strings["Cutting posts after how much characters"] = "Cortar entradas después de tantos carácteres"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Show More Settings saved."] = "Ajustes de Mostrar Más guardados."; +$a->strings["show more"] = "mostrar más"; diff --git a/smileybutton/lang/es/messages.po b/smileybutton/lang/es/messages.po new file mode 100644 index 000000000..6e27f8018 --- /dev/null +++ b/smileybutton/lang/es/messages.po @@ -0,0 +1,36 @@ +# ADDON smileybutton +# Copyright (C) +# This file is distributed under the same license as the Friendica smileybutton addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2016-11-17 22: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" + +#: smileybutton.php:269 +msgid "Smileybutton settings" +msgstr "Ajustes de Smileybutton" + +#: smileybutton.php:272 +msgid "You can hide the button and show the smilies directly." +msgstr "Puede ocultar el botón y mostrar los emoticonos directamente." + +#: smileybutton.php:274 +msgid "Hide the button" +msgstr "Ocultar el botón" + +#: smileybutton.php:281 +msgid "Save Settings" +msgstr "Guardar Ajustes" diff --git a/smileybutton/lang/es/strings.php b/smileybutton/lang/es/strings.php new file mode 100644 index 000000000..96a6cc10a --- /dev/null +++ b/smileybutton/lang/es/strings.php @@ -0,0 +1,11 @@ +strings["Smileybutton settings"] = "Ajustes de Smileybutton"; +$a->strings["You can hide the button and show the smilies directly."] = "Puede ocultar el botón y mostrar los emoticonos directamente."; +$a->strings["Hide the button"] = "Ocultar el botón"; +$a->strings["Save Settings"] = "Guardar Ajustes"; diff --git a/snautofollow/lang/es/messages.po b/snautofollow/lang/es/messages.po new file mode 100644 index 000000000..afd88331c --- /dev/null +++ b/snautofollow/lang/es/messages.po @@ -0,0 +1,36 @@ +# ADDON snautofollow +# Copyright (C) +# This file is distributed under the same license as the Friendica snautofollow 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 22:37+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" + +#: snautofollow.php:32 +msgid "StatusNet AutoFollow settings updated." +msgstr "Ajustes de StatusNet AutoFollow actualizados." + +#: snautofollow.php:56 +msgid "StatusNet AutoFollow Settings" +msgstr "Ajustes de StatusNet AutoFollow" + +#: snautofollow.php:58 +msgid "Automatically follow any StatusNet followers/mentioners" +msgstr "Seguir automáticamente a cualquiera que te siga/mencione en StatusNet" + +#: snautofollow.php:64 +msgid "Submit" +msgstr "Enviar" diff --git a/snautofollow/lang/es/strings.php b/snautofollow/lang/es/strings.php index 7313d9d96..2800360d2 100644 --- a/snautofollow/lang/es/strings.php +++ b/snautofollow/lang/es/strings.php @@ -1,6 +1,11 @@ -strings["StatusNet AutoFollow settings updated."] = "Configuración para seguir automáticamente en StatusNet actualizada."; -$a->strings["StatusNet AutoFollow Settings"] = "Configuración para el seguimiento automático en StatusNet"; -$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Seguir automáticamente a cualquiera que me siga/mencione en StatusNet"; -$a->strings["Submit"] = "Envíar"; +strings["StatusNet AutoFollow settings updated."] = "Ajustes de StatusNet AutoFollow actualizados."; +$a->strings["StatusNet AutoFollow Settings"] = "Ajustes de StatusNet AutoFollow"; +$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Seguir automáticamente a cualquiera que te siga/mencione en StatusNet"; +$a->strings["Submit"] = "Enviar"; diff --git a/startpage/lang/es/messages.po b/startpage/lang/es/messages.po new file mode 100644 index 000000000..a2e75db51 --- /dev/null +++ b/startpage/lang/es/messages.po @@ -0,0 +1,36 @@ +# ADDON startpage +# Copyright (C) +# This file is distributed under the same license as the Friendica startpage 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 22:39+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" + +#: startpage.php:83 +msgid "Startpage Settings" +msgstr "Ajustes de Startpage" + +#: startpage.php:85 +msgid "Home page to load after login - leave blank for profile wall" +msgstr "Página principal a cargar tras el acceso - dejar en blanco para el muro de perfil" + +#: startpage.php:88 +msgid "Examples: "network" or "notifications/system"" +msgstr "Ejemplos: "network" o "notifications/system"" + +#: startpage.php:92 +msgid "Submit" +msgstr "Enviar" diff --git a/startpage/lang/es/strings.php b/startpage/lang/es/strings.php index d901e7409..bbd8aedd4 100644 --- a/startpage/lang/es/strings.php +++ b/startpage/lang/es/strings.php @@ -1,6 +1,11 @@ -strings["Startpage Settings"] = "Configuración de página inicial"; -$a->strings["Home page to load after login - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil"; -$a->strings["Examples: "network" or "notifications/system""] = "Ejemplos: "red" o "notificaciones/sistema""; -$a->strings["Submit"] = "Envíar"; +strings["Startpage Settings"] = "Ajustes de Startpage"; +$a->strings["Home page to load after login - leave blank for profile wall"] = "Página principal a cargar tras el acceso - dejar en blanco para el muro de perfil"; +$a->strings["Examples: "network" or "notifications/system""] = "Ejemplos: "network" o "notifications/system""; +$a->strings["Submit"] = "Enviar"; diff --git a/statusnet/lang/es/messages.po b/statusnet/lang/es/messages.po new file mode 100644 index 000000000..bf9cdcc66 --- /dev/null +++ b/statusnet/lang/es/messages.po @@ -0,0 +1,175 @@ +# ADDON statusnet +# Copyright (C) +# This file is distributed under the same license as the Friendica statusnet addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-27 07:21+0200\n" +"PO-Revision-Date: 2016-11-17 23:07+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" + +#: statusnet.php:151 +msgid "Post to GNU Social" +msgstr "Publicar en GNU Social" + +#: statusnet.php:196 +msgid "" +"Please contact your site administrator.
The provided API URL is not " +"valid." +msgstr "Por favor contacte con el administrador de su página.
La URL de API provista no es válida." + +#: statusnet.php:225 +msgid "We could not contact the GNU Social API with the Path you entered." +msgstr "No pudimos contactar con la API de GNU Social con el Camino que introdujo." + +#: statusnet.php:259 +msgid "GNU Social settings updated." +msgstr "Ajustes de GNU Social actualizados." + +#: statusnet.php:294 statusnet.php:298 +msgid "GNU Social Import/Export/Mirror" +msgstr "Importar/Exportar/Reflejar GNU Social" + +#: statusnet.php:313 +msgid "Globally Available GNU Social OAuthKeys" +msgstr "Disponible globalmente GNU Social OAuthKeys" + +#: statusnet.php:314 +msgid "" +"There are preconfigured OAuth key pairs for some GNU Social servers " +"available. If you are using one of them, please use these credentials. If " +"not feel free to connect to any other GNU Social instance (see below)." +msgstr "Hay pares de clave preconfigurados OAuth para algunos servidores disponibles de GNU Social. Si está utilizando uno de ellos, por favor utilice estas credenciales. Si no se siente libre de conectar a alguna otra instancia de GNU Social (vea abajo)." + +#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371 +#: statusnet.php:416 statusnet.php:699 +msgid "Save Settings" +msgstr "Guardar Ajustes" + +#: statusnet.php:322 +msgid "Provide your own OAuth Credentials" +msgstr "Proveer sus propias credenciales de OAuth" + +#: statusnet.php:323 +msgid "" +"No consumer key pair for GNU Social found. Register your Friendica Account " +"as an desktop client on your GNU Social account, copy the consumer key pair " +"here and enter the API base root.
Before you register your own OAuth " +"key pair ask the administrator if there is already a key pair for this " +"Friendica installation at your favorited GNU Social installation." +msgstr "No se encontró el par de claves de consumidor para GNU Social. Registre su cuenta de Friendica como un cliente de escritorio en su cuenta de GNU, copie el par de claves aquí e introduzca el origen de la API.
Antes de qeu registre su propio par de claves de OAuth pregunte al administrador si ya hay un par de claves para esta instalación de Friendica en su instalación de GNU Social favorita." + +#: statusnet.php:325 +msgid "OAuth Consumer Key" +msgstr "Clave de Consumidor de OAuth" + +#: statusnet.php:328 +msgid "OAuth Consumer Secret" +msgstr "Secreto de Consumidor de OAuth" + +#: statusnet.php:331 statusnet.php:679 statusnet.php:691 +msgid "Base API Path (remember the trailing /)" +msgstr "Camino Base de API (Recordar la cola /)" + +#: statusnet.php:356 +msgid "" +"To connect to your GNU Social account click the button below to get a " +"security code from GNU Social which you have to copy into the input box " +"below and submit the form. Only your public posts will be " +"posted to GNU Social." +msgstr "Para conectarse a su cuenta GNU Social click en el botón de abajo para obtener un código de seguridad de GNU Social que puede copiar en la caja de abajo y enviar el formulario. Sólo sus entradas públicas se publicarán en GNU Social." + +#: statusnet.php:357 +msgid "Log in with GNU Social" +msgstr "Acceder a GNU Social" + +#: statusnet.php:359 +msgid "Copy the security code from GNU Social here" +msgstr "Copiar el código de seguridad de GNU Social aquí" + +#: statusnet.php:365 +msgid "Cancel Connection Process" +msgstr "Cancelar el Proceso de Conexión" + +#: statusnet.php:367 +msgid "Current GNU Social API is" +msgstr "API de GNU Social actual" + +#: statusnet.php:368 +msgid "Cancel GNU Social Connection" +msgstr "Cancelar la conexión a GNU Social" + +#: statusnet.php:379 +msgid "Currently connected to: " +msgstr "Actualmente conectado a:" + +#: statusnet.php:380 +msgid "" +"If enabled all your public postings can be posted to the " +"associated GNU Social account. You can choose to do so by default (here) or " +"for every posting separately in the posting options when writing the entry." +msgstr "Si está habilitado, todas sus publicaciones públicas pueden publicarse en la cuenta asociada de GNU Social. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de publicación mientras escribe la entrada." + +#: statusnet.php:382 +msgid "" +"Note: Due your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to GNU Social will lead the visitor to a blank page " +"informing the visitor that the access to your profile has been restricted." +msgstr "Nota: Debido a sus ajustes de privacidad (?Ocultar los detalles de su perfil a espectadores desconocidos?) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido." + +#: statusnet.php:385 +msgid "Allow posting to GNU Social" +msgstr "Permitir publicar en GNU Social" + +#: statusnet.php:388 +msgid "Send public postings to GNU Social by default" +msgstr "Enviar las publicaciones públicas a GNU Social por defecto" + +#: statusnet.php:392 +msgid "" +"Mirror all posts from GNU Social that are no replies or repeated messages" +msgstr "Reflejar todas las entradas de GNU Social que no son respuestas o mensajes repetidos" + +#: statusnet.php:398 +msgid "Import the remote timeline" +msgstr "Importar la línea de tiempo remota" + +#: statusnet.php:402 +msgid "Disabled" +msgstr "Deshabilitado" + +#: statusnet.php:403 +msgid "Full Timeline" +msgstr "Línea de Tiempo completa" + +#: statusnet.php:404 +msgid "Only Mentions" +msgstr "Sólo Menciones" + +#: statusnet.php:413 +msgid "Clear OAuth configuration" +msgstr "Limpiar la configuración de OAuth" + +#: statusnet.php:690 +msgid "Site name" +msgstr "Nombre de la página" + +#: statusnet.php:692 +msgid "Consumer Secret" +msgstr "Secreto de Consumidor" + +#: statusnet.php:693 +msgid "Consumer Key" +msgstr "Clave de Consumidor" diff --git a/statusnet/lang/es/strings.php b/statusnet/lang/es/strings.php index c60fb3744..d33fa0fd3 100644 --- a/statusnet/lang/es/strings.php +++ b/statusnet/lang/es/strings.php @@ -1,32 +1,40 @@ -strings["Post to StatusNet"] = "Publicar en StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor, contacta con el administrador de tu web.
La dirección API suministrada no es válida."; -$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No podemos contantar con StatusNet en la ruta que has especificado."; -$a->strings["StatusNet settings updated."] = "Actualición de la configuración de StatusNet."; -$a->strings["StatusNet Posting Settings"] = "Configuración de envío a StatusNet"; -$a->strings["Globally Available StatusNet OAuthKeys"] = "StatusNet OAuthKeys disponibles para todos"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Existen pares de valores OAuthKey preconfigurados para algunos servidores. Si usas uno de ellos, por favor usa estas credenciales. De los contrario no dudes en conectar con cualquiera otra instancia de StatusNet (ver a continuación)."; -$a->strings["Submit"] = "Envíar"; -$a->strings["Provide your own OAuth Credentials"] = "Proporciona tus propias credenciales OAuth"; -$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No se ha encontrado ningún par de claves consumer para StatusNet. Registra tu cuenta de Friendica como un cliente de escritorio en tu cuenta de StatusNet, copia el par de claves consumer aquí e introduce la dirección de la API.
Antes de registrar tu propio par de claves OAuth pregunta a tu administrador si ya existe un par de claves para esa instalación de Friendica en tu instalación StatusNet favorita."; -$a->strings["OAuth Consumer Key"] = "Clave OAuth del usuario"; -$a->strings["OAuth Consumer Secret"] = "Secreto OAuth del usuario"; -$a->strings["Base API Path (remember the trailing /)"] = "Dirección de la API (recordar el / al final)"; -$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet."] = "Para conectarte a tu cuenta de StatusNet haz clic en el botón abajo para obtener un PIN de StatusNet, que tienes que copiar en el cuadro de entrada y enviar el formulario. Solo tus publicaciones públicas se publicarán en StatusNet."; -$a->strings["Log in with StatusNet"] = "Inicia sesión en StatusNet"; -$a->strings["Copy the security code from StatusNet here"] = "Copia el código de seguridad de StatusNet aquí"; -$a->strings["Cancel Connection Process"] = "Cancelar la conexión en proceso"; -$a->strings["Current StatusNet API is"] = "El estado actual de la API de StatusNet es"; -$a->strings["Cancel StatusNet Connection"] = "Cancelar conexión con StatusNet"; -$a->strings["Currently connected to: "] = "Actualmente conectado a:"; -$a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si lo habilitas todas tus publicaciones públicas podrán ser publicadas en la cuenta asociada de StatusNet. Pudes elegir hacerlo por defecto (aquí) o para cada publicación individualmente en las opciones de publicacion cuando las escribes."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a tus opciones de privacidad (¿Ocultar los detalles de tu perfil de espectadores desconocidos?) el vínculo potencialmente incluido en publicaciones públicas que se transmiten a StatusNet conducirá al visitante a una página en blanco que informa a los visitantes que el acceso a tu perfil es restringido."; -$a->strings["Allow posting to StatusNet"] = "Permitir publicaciones en StatusNet"; -$a->strings["Send public postings to StatusNet by default"] = "Enviar publicaciones públicas a StatusNet por defecto"; -$a->strings["Send linked #-tags and @-names to StatusNet"] = "Enviar a StatusNet las #-etiquetas y @-nombres"; -$a->strings["Clear OAuth configuration"] = "Borrar la configuración de OAuth"; -$a->strings["Site name"] = "Nombre del sitio"; -$a->strings["API URL"] = "Dirección de la API"; -$a->strings["Consumer Secret"] = "Secreto del consumidor"; -$a->strings["Consumer Key"] = "Clave del consumidor"; +strings["Post to GNU Social"] = "Publicar en GNU Social"; +$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Por favor contacte con el administrador de su página.
La URL de API provista no es válida."; +$a->strings["We could not contact the GNU Social API with the Path you entered."] = "No pudimos contactar con la API de GNU Social con el Camino que introdujo."; +$a->strings["GNU Social settings updated."] = "Ajustes de GNU Social actualizados."; +$a->strings["GNU Social Import/Export/Mirror"] = "Importar/Exportar/Reflejar GNU Social"; +$a->strings["Globally Available GNU Social OAuthKeys"] = "Disponible globalmente GNU Social OAuthKeys"; +$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Hay pares de clave preconfigurados OAuth para algunos servidores disponibles de GNU Social. Si está utilizando uno de ellos, por favor utilice estas credenciales. Si no se siente libre de conectar a alguna otra instancia de GNU Social (vea abajo)."; +$a->strings["Save Settings"] = "Guardar Ajustes"; +$a->strings["Provide your own OAuth Credentials"] = "Proveer sus propias credenciales de OAuth"; +$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "No se encontró el par de claves de consumidor para GNU Social. Registre su cuenta de Friendica como un cliente de escritorio en su cuenta de GNU, copie el par de claves aquí e introduzca el origen de la API.
Antes de qeu registre su propio par de claves de OAuth pregunte al administrador si ya hay un par de claves para esta instalación de Friendica en su instalación de GNU Social favorita."; +$a->strings["OAuth Consumer Key"] = "Clave de Consumidor de OAuth"; +$a->strings["OAuth Consumer Secret"] = "Secreto de Consumidor de OAuth"; +$a->strings["Base API Path (remember the trailing /)"] = "Camino Base de API (Recordar la cola /)"; +$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social."] = "Para conectarse a su cuenta GNU Social click en el botón de abajo para obtener un código de seguridad de GNU Social que puede copiar en la caja de abajo y enviar el formulario. Sólo sus entradas públicas se publicarán en GNU Social."; +$a->strings["Log in with GNU Social"] = "Acceder a GNU Social"; +$a->strings["Copy the security code from GNU Social here"] = "Copiar el código de seguridad de GNU Social aquí"; +$a->strings["Cancel Connection Process"] = "Cancelar el Proceso de Conexión"; +$a->strings["Current GNU Social API is"] = "API de GNU Social actual"; +$a->strings["Cancel GNU Social Connection"] = "Cancelar la conexión a GNU Social"; +$a->strings["Currently connected to: "] = "Actualmente conectado a:"; +$a->strings["If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si está habilitado, todas sus publicaciones públicas pueden publicarse en la cuenta asociada de GNU Social. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de publicación mientras escribe la entrada."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: Debido a sus ajustes de privacidad (?Ocultar los detalles de su perfil a espectadores desconocidos?) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido."; +$a->strings["Allow posting to GNU Social"] = "Permitir publicar en GNU Social"; +$a->strings["Send public postings to GNU Social by default"] = "Enviar las publicaciones públicas a GNU Social por defecto"; +$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Reflejar todas las entradas de GNU Social que no son respuestas o mensajes repetidos"; +$a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota"; +$a->strings["Disabled"] = "Deshabilitado"; +$a->strings["Full Timeline"] = "Línea de Tiempo completa"; +$a->strings["Only Mentions"] = "Sólo Menciones"; +$a->strings["Clear OAuth configuration"] = "Limpiar la configuración de OAuth"; +$a->strings["Site name"] = "Nombre de la página"; +$a->strings["Consumer Secret"] = "Secreto de Consumidor"; +$a->strings["Consumer Key"] = "Clave de Consumidor"; From 87697cc233c30926e4cdd24e60e6526dd63efd44 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 19 Nov 2016 06:17:07 +0100 Subject: [PATCH 24/58] ES translation work THX Albert --- superblock/lang/es/messages.po | 53 ++++++++++++++++++++++++++++++++++ superblock/lang/es/strings.php | 25 +++++++++------- testdrive/lang/es/messages.po | 41 ++++++++++++++++++++++++++ testdrive/lang/es/strings.php | 16 ++++++---- 4 files changed, 120 insertions(+), 15 deletions(-) create mode 100644 superblock/lang/es/messages.po create mode 100644 testdrive/lang/es/messages.po diff --git a/superblock/lang/es/messages.po b/superblock/lang/es/messages.po new file mode 100644 index 000000000..33f8e000a --- /dev/null +++ b/superblock/lang/es/messages.po @@ -0,0 +1,53 @@ +# ADDON blockem +# Copyright (C) +# This file is distributed under the same license as the Friendica blockem 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-18 11: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" + +#: blockem.php:51 +msgid "\"Blockem\" Settings" +msgstr "Ajustes de \"Blockem\"" + +#: blockem.php:53 +msgid "Comma separated profile URLS to block" +msgstr "Perfil de URLS a bloque separado por comas" + +#: blockem.php:57 +msgid "Submit" +msgstr "Enviar" + +#: blockem.php:70 +msgid "BLOCKEM Settings saved." +msgstr "Ajustes de BLOCKEM guardados." + +#: blockem.php:105 +#, php-format +msgid "Blocked %s - Click to open/close" +msgstr "%s bloqueados - Click para abrir/cerrar" + +#: blockem.php:160 +msgid "Unblock Author" +msgstr "Desbloquear Autor" + +#: blockem.php:162 +msgid "Block Author" +msgstr "Bloquear autor" + +#: blockem.php:194 +msgid "blockem settings updated" +msgstr "Ajustes de Blockem actualizados" diff --git a/superblock/lang/es/strings.php b/superblock/lang/es/strings.php index 874d6d7f4..2d9cef8c0 100644 --- a/superblock/lang/es/strings.php +++ b/superblock/lang/es/strings.php @@ -1,10 +1,15 @@ -strings["\"Blockem\" Settings"] = "Configuración de \"Blockem\""; -$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear"; -$a->strings["Submit"] = "Envíar"; -$a->strings["BLOCKEM Settings saved."] = "Configuracion Blockem guardada."; -$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado. Pulsa aquí para mostrar/ocultar"; -$a->strings["Unblock Author"] = "Desbloquear Autor"; -$a->strings["Block Author"] = "Bloquear Autor"; -$a->strings["blockem settings updated"] = "Configuración de Blockem actualizada"; +strings["\"Blockem\" Settings"] = "Ajustes de \"Blockem\""; +$a->strings["Comma separated profile URLS to block"] = "Perfil de URLS a bloque separado por comas"; +$a->strings["Submit"] = "Enviar"; +$a->strings["BLOCKEM Settings saved."] = "Ajustes de BLOCKEM guardados."; +$a->strings["Blocked %s - Click to open/close"] = "%s bloqueados - Click para abrir/cerrar"; +$a->strings["Unblock Author"] = "Desbloquear Autor"; +$a->strings["Block Author"] = "Bloquear autor"; +$a->strings["blockem settings updated"] = "Ajustes de Blockem actualizados"; diff --git a/testdrive/lang/es/messages.po b/testdrive/lang/es/messages.po new file mode 100644 index 000000000..d19a907a9 --- /dev/null +++ b/testdrive/lang/es/messages.po @@ -0,0 +1,41 @@ +# ADDON testdrive +# Copyright (C) +# This file is distributed under the same license as the Friendica testdrive addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-23 17:30+0200\n" +"PO-Revision-Date: 2016-11-18 11:58+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" + +#: testdrive.php:67 +msgid "Administrator" +msgstr "Administrador" + +#: testdrive.php:94 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "Su cuenta de %s expirará en unos días." + +#: testdrive.php:95 +msgid "Your Friendica test account is about to expire." +msgstr "Su cuenta de prueba de Friendica está a punto de expirar." + +#: testdrive.php:96 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com." +msgstr "Hola %1$s,\n\nSu cuenta de prueba de %2$s expirará en menos de cinco días. Esperamos que disfrute este drive de prueba y usar esta oportunidad para encontrar una página web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en %s/siteinfo - y para más información ajustando su servidor de Friendica por favor vea la página del proyecto de Friendica en http://friendica.com." diff --git a/testdrive/lang/es/strings.php b/testdrive/lang/es/strings.php index 2f66ef19c..2292d3fd8 100644 --- a/testdrive/lang/es/strings.php +++ b/testdrive/lang/es/strings.php @@ -1,5 +1,11 @@ -strings["Administrator"] = "Administrador"; -$a->strings["Your account on %s will expire in a few days."] = "Tu cuenta de %s expirará en pocos días."; -$a->strings["Your Friendica test account is about to expire."] = "Tu cuenta de prueba de Friendica está a punto de expirar."; +strings["Administrator"] = "Administrador"; +$a->strings["Your account on %s will expire in a few days."] = "Su cuenta de %s expirará en unos días."; +$a->strings["Your Friendica test account is about to expire."] = "Su cuenta de prueba de Friendica está a punto de expirar."; +$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hola %1\$s,\n\nSu cuenta de prueba de %2\$s expirará en menos de cinco días. Esperamos que disfrute este drive de prueba y usar esta oportunidad para encontrar una página web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en %s/siteinfo - y para más información ajustando su servidor de Friendica por favor vea la página del proyecto de Friendica en http://friendica.com."; From e99e6602988dd963a5f6acd3211b095d86865b37 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 20 Nov 2016 06:26:42 +0100 Subject: [PATCH 25/58] ES translation work - muchas gracias Albert --- krynn/lang/es/messages.po | 32 ++++++++++++ krynn/lang/es/strings.php | 15 ++++-- langfilter/lang/es/messages.po | 70 ++++++++++++++++++++++++++ langfilter/lang/es/strings.php | 17 +++++++ tictac/lang/es/messages.po | 74 ++++++++++++++++++++++++++++ tictac/lang/es/strings.php | 33 +++++++------ uhremotestorage/lang/es/messages.po | 45 +++++++++++++++++ uhremotestorage/lang/es/strings.php | 19 ++++--- windowsphonepush/lang/es/messages.po | 40 +++++++++++++++ windowsphonepush/lang/es/strings.php | 12 +++++ wppost/lang/es/messages.po | 64 ++++++++++++++++++++++++ wppost/lang/es/strings.php | 31 +++++++----- yourls/lang/es/messages.po | 48 ++++++++++++++++++ yourls/lang/es/strings.php | 23 +++++---- 14 files changed, 475 insertions(+), 48 deletions(-) create mode 100644 krynn/lang/es/messages.po create mode 100644 langfilter/lang/es/messages.po create mode 100644 langfilter/lang/es/strings.php create mode 100644 tictac/lang/es/messages.po create mode 100644 uhremotestorage/lang/es/messages.po create mode 100644 windowsphonepush/lang/es/messages.po create mode 100644 windowsphonepush/lang/es/strings.php create mode 100644 wppost/lang/es/messages.po create mode 100644 yourls/lang/es/messages.po diff --git a/krynn/lang/es/messages.po b/krynn/lang/es/messages.po new file mode 100644 index 000000000..e2015a379 --- /dev/null +++ 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" diff --git a/krynn/lang/es/strings.php b/krynn/lang/es/strings.php index 3369d1b4b..77df4d4e6 100644 --- a/krynn/lang/es/strings.php +++ b/krynn/lang/es/strings.php @@ -1,5 +1,10 @@ -strings["Krynn Settings"] = "Configuración de Krynn"; -$a->strings["Enable Krynn Plugin"] = "Activar el módulo de planetas Krynn"; -$a->strings["Submit"] = "Envíar"; +strings["Krynn Settings"] = "Ajustes de Krynn"; +$a->strings["Enable Krynn Plugin"] = "Habilitar Plugin de Krynn"; +$a->strings["Submit"] = "Enviar"; diff --git a/langfilter/lang/es/messages.po b/langfilter/lang/es/messages.po new file mode 100644 index 000000000..911fb90bc --- /dev/null +++ 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" diff --git a/langfilter/lang/es/strings.php b/langfilter/lang/es/strings.php new file mode 100644 index 000000000..15a6d5742 --- /dev/null +++ b/langfilter/lang/es/strings.php @@ -0,0 +1,17 @@ +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"; diff --git a/tictac/lang/es/messages.po b/tictac/lang/es/messages.po new file mode 100644 index 000000000..d503d47d6 --- /dev/null +++ b/tictac/lang/es/messages.po @@ -0,0 +1,74 @@ +# ADDON tictac +# Copyright (C) +# This file is distributed under the same license as the Friendica tictac 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:32+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" + +#: tictac.php:20 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "Tic-Tac-Toe tridimensional" + +#: tictac.php:53 +msgid "3D Tic-Tac-Toe" +msgstr "3D Tic-Tac-Toe" + +#: tictac.php:58 +msgid "New game" +msgstr "Nuevo juego" + +#: tictac.php:59 +msgid "New game with handicap" +msgstr "Nuevo juego con desventajas" + +#: tictac.php:60 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " +msgstr "El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. " + +#: tictac.php:61 +msgid "" +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." +msgstr "En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles." + +#: tictac.php:63 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." +msgstr "El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta." + +#: tictac.php:182 +msgid "You go first..." +msgstr "Usted va primero..." + +#: tictac.php:187 +msgid "I'm going first this time..." +msgstr "Yo voy primero esta vez..." + +#: tictac.php:193 +msgid "You won!" +msgstr "¡Usted ha ganado!" + +#: tictac.php:199 tictac.php:224 +msgid "\"Cat\" game!" +msgstr "¡Juego \"Gato\"!" + +#: tictac.php:222 +msgid "I won!" +msgstr "¡Yo gané!" diff --git a/tictac/lang/es/strings.php b/tictac/lang/es/strings.php index 65a735319..600c84cf3 100644 --- a/tictac/lang/es/strings.php +++ b/tictac/lang/es/strings.php @@ -1,14 +1,19 @@ -strings["Three Dimensional Tic-Tac-Toe"] = "Tres en Raya tridimensional"; -$a->strings["3D Tic-Tac-Toe"] = "Tres en Raya 3D"; -$a->strings["New game"] = "Nueva partida"; -$a->strings["New game with handicap"] = "Nuevo juego con handicap"; -$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tres en Raya tridimensional es como el juego tradicional, excepto que se juega en varios niveles simultáneamente."; -$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En este caso hay tres niveles. Ganarás por conseguir tres en raya en cualquier nivel, así como arriba, abajo y en diagonal a través de los diferentes niveles."; -$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El juego con handicap desactiva la posición central en el nivel medio porque el jugador que la ocupa tiene a menudo una ventaja injusta."; -$a->strings["You go first..."] = "Comienzas tú..."; -$a->strings["I'm going first this time..."] = "Yo voy primero esta vez..."; -$a->strings["You won!"] = "¡Has ganado!"; -$a->strings["\"Cat\" game!"] = "¡Empate!"; -$a->strings["I won!"] = "¡He ganado!"; +strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensional"; +$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe"; +$a->strings["New game"] = "Nuevo juego"; +$a->strings["New game with handicap"] = "Nuevo juego con desventajas"; +$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. "; +$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles."; +$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta."; +$a->strings["You go first..."] = "Usted va primero..."; +$a->strings["I'm going first this time..."] = "Yo voy primero esta vez..."; +$a->strings["You won!"] = "¡Usted ha ganado!"; +$a->strings["\"Cat\" game!"] = "¡Juego \"Gato\"!"; +$a->strings["I won!"] = "¡Yo gané!"; diff --git a/uhremotestorage/lang/es/messages.po b/uhremotestorage/lang/es/messages.po new file mode 100644 index 000000000..9b3de0081 --- /dev/null +++ b/uhremotestorage/lang/es/messages.po @@ -0,0 +1,45 @@ +# ADDON uhremotestorage +# Copyright (C) +# This file is distributed under the same license as the Friendica uhremotestorage addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2016-11-19 11: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" + +#: uhremotestorage.php:84 +#, php-format +msgid "" +"Allow to use your friendica id (%s) to connecto to external unhosted-enabled" +" storage (like ownCloud). See RemoteStorage" +" WebFinger" +msgstr "Permite usar su ID de Friendica (%s) para conectar a un almacén habilitado externo sin hospedar (como ownCloud). Vea RemoteStorage WebFinger" + +#: uhremotestorage.php:85 +msgid "Template URL (with {category})" +msgstr "Plantilla de URL (con {categoría})" + +#: uhremotestorage.php:86 +msgid "OAuth end-point" +msgstr "Punto final de OAuth" + +#: uhremotestorage.php:87 +msgid "Api" +msgstr "API" + +#: uhremotestorage.php:89 +msgid "Save Settings" +msgstr "Guardar Ajustes" diff --git a/uhremotestorage/lang/es/strings.php b/uhremotestorage/lang/es/strings.php index 16c28a755..910a0562f 100644 --- a/uhremotestorage/lang/es/strings.php +++ b/uhremotestorage/lang/es/strings.php @@ -1,7 +1,12 @@ -strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Permitir el uso de tu ID de Friendica (%s) para conexiones de almacenamiento externo sin alojamiento activado (como OwnCloud). Mira RemoteStorage WebFinger"; -$a->strings["Template URL (with {category})"] = "Dirección de la plantilla (con {categoría})"; -$a->strings["OAuth end-point"] = "Punto final OAuth"; -$a->strings["Api"] = "API"; -$a->strings["Submit"] = "Envíar"; +strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Permite usar su ID de Friendica (%s) para conectar a un almacén habilitado externo sin hospedar (como ownCloud). Vea RemoteStorage WebFinger"; +$a->strings["Template URL (with {category})"] = "Plantilla de URL (con {categoría})"; +$a->strings["OAuth end-point"] = "Punto final de OAuth"; +$a->strings["Api"] = "API"; +$a->strings["Save Settings"] = "Guardar Ajustes"; diff --git a/windowsphonepush/lang/es/messages.po b/windowsphonepush/lang/es/messages.po new file mode 100644 index 000000000..7d561c218 --- /dev/null +++ b/windowsphonepush/lang/es/messages.po @@ -0,0 +1,40 @@ +# ADDON windowsphonepush +# Copyright (C) +# This file is distributed under the same license as the Friendica windowsphonepush addon package. +# +# +# Translators: +# Albert, 2016 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-26 15:02+0100\n" +"PO-Revision-Date: 2016-11-19 11:41+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" + +#: windowsphonepush.php:85 +msgid "WindowsPhonePush settings updated." +msgstr "Ajustes de WindowsPhonePush actualizados." + +#: windowsphonepush.php:114 +msgid "WindowsPhonePush Settings" +msgstr "Ajustes de WindowsPhonePush" + +#: windowsphonepush.php:117 +msgid "Enable WindowsPhonePush Plugin" +msgstr "Habilitar Plugin de WindowsPhonePush" + +#: windowsphonepush.php:122 +msgid "Push text of new item" +msgstr "Empujar texto de nuevo objeto" + +#: windowsphonepush.php:127 +msgid "Save Settings" +msgstr "Guardar Ajustes" diff --git a/windowsphonepush/lang/es/strings.php b/windowsphonepush/lang/es/strings.php new file mode 100644 index 000000000..22a5c4c5c --- /dev/null +++ b/windowsphonepush/lang/es/strings.php @@ -0,0 +1,12 @@ +strings["WindowsPhonePush settings updated."] = "Ajustes de WindowsPhonePush actualizados."; +$a->strings["WindowsPhonePush Settings"] = "Ajustes de WindowsPhonePush"; +$a->strings["Enable WindowsPhonePush Plugin"] = "Habilitar Plugin de WindowsPhonePush"; +$a->strings["Push text of new item"] = "Empujar texto de nuevo objeto"; +$a->strings["Save Settings"] = "Guardar Ajustes"; diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po new file mode 100644 index 000000000..98365fb19 --- /dev/null +++ b/wppost/lang/es/messages.po @@ -0,0 +1,64 @@ +# ADDON wppost +# Copyright (C) +# This file is distributed under the same license as the Friendica wppost 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: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" + +#: wppost.php:42 +msgid "Post to Wordpress" +msgstr "Publicar en Wordpress" + +#: wppost.php:76 +msgid "WordPress Post Settings" +msgstr "Ajustes de publicación de WordPress" + +#: wppost.php:78 +msgid "Enable WordPress Post Plugin" +msgstr "Habilitar Plugin de publicación de WordPress" + +#: wppost.php:83 +msgid "WordPress username" +msgstr "Nombre de usuario de WordPress" + +#: wppost.php:88 +msgid "WordPress password" +msgstr "Contraseña de WordPress" + +#: wppost.php:93 +msgid "WordPress API URL" +msgstr "URL de API de WordPress" + +#: wppost.php:98 +msgid "Post to WordPress by default" +msgstr "Publicar en WordPress por defecto" + +#: wppost.php:103 +msgid "Provide a backlink to the Friendica post" +msgstr "Proveer un enlace inverso a la entrada de Friendica" + +#: wppost.php:110 +msgid "Submit" +msgstr "Enviar" + +#: wppost.php:201 +msgid "Post from Friendica" +msgstr "Publicar desde Friendica" + +#: wppost.php:207 +msgid "Read the original post and comment stream on Friendica" +msgstr "Leer la entrada original y transmitir comentarios en Friendica" diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php index 1e01a2f48..525cb8834 100644 --- a/wppost/lang/es/strings.php +++ b/wppost/lang/es/strings.php @@ -1,13 +1,18 @@ -strings["Post to Wordpress"] = "Publicar en Wordpress"; -$a->strings["WordPress Post Settings"] = "Configuración de publicación en Wordpres"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar el módulo de publicación en Wordpress"; -$a->strings["WordPress username"] = "WordPress - nombre de usuario"; -$a->strings["WordPress password"] = "WordPress - contraseña"; -$a->strings["WordPress API URL"] = "WordPress - dirección API"; -$a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto"; -$a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica"; -$a->strings["Submit"] = "Envíar"; -$a->strings["Post from Friendica"] = "Publicado desde Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica"; +strings["Post to Wordpress"] = "Publicar en Wordpress"; +$a->strings["WordPress Post Settings"] = "Ajustes de publicación de WordPress"; +$a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress"; +$a->strings["WordPress username"] = "Nombre de usuario de WordPress"; +$a->strings["WordPress password"] = "Contraseña de WordPress"; +$a->strings["WordPress API URL"] = "URL de API de WordPress"; +$a->strings["Post to WordPress by default"] = "Publicar en WordPress por defecto"; +$a->strings["Provide a backlink to the Friendica post"] = "Proveer un enlace inverso a la entrada de Friendica"; +$a->strings["Submit"] = "Enviar"; +$a->strings["Post from Friendica"] = "Publicar desde Friendica"; +$a->strings["Read the original post and comment stream on Friendica"] = "Leer la entrada original y transmitir comentarios en Friendica"; diff --git a/yourls/lang/es/messages.po b/yourls/lang/es/messages.po new file mode 100644 index 000000000..bf8110ff2 --- /dev/null +++ b/yourls/lang/es/messages.po @@ -0,0 +1,48 @@ +# ADDON yourls +# Copyright (C) +# This file is distributed under the same license as the Friendica yourls 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:40+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" + +#: yourls.php:55 +msgid "YourLS Settings" +msgstr "Sus Ajustes LS" + +#: yourls.php:57 +msgid "URL: http://" +msgstr "URL: http://" + +#: yourls.php:62 +msgid "Username:" +msgstr "Nombre de usuario:" + +#: yourls.php:67 +msgid "Password:" +msgstr "Contraseña:" + +#: yourls.php:72 +msgid "Use SSL " +msgstr "Usar SSL " + +#: yourls.php:76 +msgid "Submit" +msgstr "Enviar" + +#: yourls.php:92 +msgid "yourls Settings saved." +msgstr "Sus Ajustes de han guardado." diff --git a/yourls/lang/es/strings.php b/yourls/lang/es/strings.php index 925b62ada..d2845438f 100644 --- a/yourls/lang/es/strings.php +++ b/yourls/lang/es/strings.php @@ -1,9 +1,14 @@ -strings["YourLS Settings"] = "Tu configuración LS"; -$a->strings["URL: http://"] = "Dirección: http://"; -$a->strings["Username:"] = "Nombre de Usuario:"; -$a->strings["Password:"] = "Contraseña:"; -$a->strings["Use SSL "] = "Usar SSL "; -$a->strings["Submit"] = "Envíar"; -$a->strings["yourls Settings saved."] = "La configuración se ha guardado."; +strings["YourLS Settings"] = "Sus Ajustes LS"; +$a->strings["URL: http://"] = "URL: http://"; +$a->strings["Username:"] = "Nombre de usuario:"; +$a->strings["Password:"] = "Contraseña:"; +$a->strings["Use SSL "] = "Usar SSL "; +$a->strings["Submit"] = "Enviar"; +$a->strings["yourls Settings saved."] = "Sus Ajustes de han guardado."; From bbafef4280a99e708f1e55cd58f2129c2c2c8279 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 22 Nov 2016 07:45:27 +0100 Subject: [PATCH 26/58] IT curweather translation --- curweather/lang/it/messages.po | 65 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/curweather/lang/it/messages.po b/curweather/lang/it/messages.po index 52510b104..9bfb4b85e 100644 --- a/curweather/lang/it/messages.po +++ b/curweather/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015 +# Tobias Diekershoff , 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 \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 \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. Berlin,DE or " "14476,DE." msgstr "Identificatore della tua posizione (nome o CAP), p.e. Roma, IT or 00186,IT." -#: 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 °C or °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" From 7175105fe5f43a3e5ce238fa73a996043a7d5d65 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 22 Nov 2016 07:48:46 +0100 Subject: [PATCH 27/58] IT fromgplus translation --- fromgplus/lang/it/messages.po | 37 +++++++++++++++++++++++------------ fromgplus/lang/it/strings.php | 7 +++++-- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/fromgplus/lang/it/messages.po b/fromgplus/lang/it/messages.po index 63384400a..c522dea46 100644 --- a/fromgplus/lang/it/messages.po +++ b/fromgplus/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015 +# Tobias Diekershoff , 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" -"Last-Translator: fabrixxm \n" +"POT-Creation-Date: 2016-11-12 16:52+0000\n" +"PO-Revision-Date: 2016-11-22 06:48+0000\n" +"Last-Translator: Tobias Diekershoff \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,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 "" -#: 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 "" + +#: fromgplus.php:103 +msgid "Settings updated." +msgstr "Impostazioni aggiornate." diff --git a/fromgplus/lang/it/strings.php b/fromgplus/lang/it/strings.php index f3abc3a00..f66250f93 100644 --- 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"] = ""; +$a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Google+ Import Settings saved."] = "Impostazioni Importa Google+ salvate"; +$a->strings["Key"] = ""; +$a->strings["Settings updated."] = "Impostazioni aggiornate."; From 91e2563cd1aaa6a4ec9513b2bc6589ff360df10d Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 9 Dec 2016 09:59:08 +0000 Subject: [PATCH 28/58] Twitter: We now support quotes and long posts --- twitter/twitter.php | 124 ++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 1cc8fd649..e0148a11c 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1181,6 +1181,8 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) { $tags = ""; + $plain = $body; + if (isset($item->entities->urls)) { $type = ""; $footerurl = ""; @@ -1188,6 +1190,9 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) { $footer = ""; foreach ($item->entities->urls AS $url) { + + $plain = str_replace($url->url, '', $plain); + if ($url->url AND $url->expanded_url AND $url->display_url) { $expanded_url = original_url($url->expanded_url); @@ -1261,7 +1266,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) { $body = add_page_info_to_body($body); if ($no_tags) - return(array("body" => $body, "tags" => "")); + return array("body" => $body, "tags" => "", "plain" => $plain); $tags_arr = array(); @@ -1317,7 +1322,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) { $tags = implode($tags_arr, ","); } - return(array("body" => $body, "tags" => $tags)); + return array("body" => $body, "tags" => $tags, "plain" => $plain); } function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) { @@ -1330,14 +1335,16 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['uid'] = $uid; $postarray['wall'] = 0; $postarray['uri'] = "twitter::".$post->id_str; + $postarray['object'] = json_encode($post); $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($postarray['uri']), intval($uid) ); - if (count($r)) + if (count($r)) { return(array()); + } $contactid = 0; @@ -1384,8 +1391,9 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['owner-name'] = $r[0]["name"]; $postarray['owner-link'] = $r[0]["url"]; $postarray['owner-avatar'] = $r[0]["photo"]; - } else + } else { return(array()); + } } // Don't create accounts of people who just comment something $create_user = false; @@ -1402,10 +1410,11 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https); } - if(($contactid == 0) AND !$only_existing_contact) + if(($contactid == 0) AND !$only_existing_contact) { $contactid = $self['id']; - elseif ($contactid <= 0) + } elseif ($contactid <= 0) { return(array()); + } $postarray['contact-id'] = $contactid; @@ -1421,7 +1430,11 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['allow_cid'] = '<' . $self['id'] . '>'; } - $postarray['body'] = $post->text; + if (is_string($post->full_text)) { + $postarray['body'] = $post->full_text; + } else { + $postarray['body'] = $post->text; + } $picture = ""; @@ -1445,72 +1458,45 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture); $postarray['body'] = $converted["body"]; $postarray['tag'] = $converted["tags"]; - $postarray['created'] = datetime_convert('UTC','UTC',$post->created_at); $postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at); - if (is_string($post->place->name)) + $statustext = $converted["plain"]; + + if (is_string($post->place->name)) { $postarray["location"] = $post->place->name; - - if (is_string($post->place->full_name)) - $postarray["location"] = $post->place->full_name; - - if (is_array($post->geo->coordinates)) - $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; - - if (is_array($post->coordinates->coordinates)) - $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; - - if (is_object($post->retweeted_status)) { - - $postarray['body'] = $post->retweeted_status->text; - - $picture = ""; - - // media - if (is_array($post->retweeted_status->entities->media)) { - foreach($post->retweeted_status->entities->media AS $media) { - switch($media->type) { - case 'photo': - //$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']); - //$has_picture = true; - $postarray['body'] = str_replace($media->url, "", $postarray['body']); - $postarray['object-type'] = ACTIVITY_OBJ_IMAGE; - $picture = $media->media_url_https; - break; - default: - $postarray['body'] .= print_r($media, true); - } - } - } - - $converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $picture); - $postarray['body'] = $converted["body"]; - $postarray['tag'] = $converted["tags"]; - - twitter_fetch_contact($uid, $post->retweeted_status->user, false); - - // Deactivated at the moment, since there are problems with answers to retweets - if (false AND !intval(get_config('system','wall-to-wall_share'))) { - $postarray['body'] = "[share author='".$post->retweeted_status->user->name. - "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name. - "' avatar='".$post->retweeted_status->user->profile_image_url_https. - "' posted='".datetime_convert('UTC','UTC',$post->retweeted_status->created_at). - "' link='https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str."']". - $postarray['body']; - $postarray['body'] .= "[/share]"; - } else { - // Let retweets look like wall-to-wall posts - $postarray['author-name'] = $post->retweeted_status->user->name; - $postarray['author-link'] = "https://twitter.com/".$post->retweeted_status->user->screen_name; - $postarray['author-avatar'] = twitter_fix_avatar($post->retweeted_status->user->profile_image_url_https); - //if (($post->retweeted_status->user->screen_name != "") AND ($post->retweeted_status->id_str != "")) { - // $postarray['plink'] = "https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str; - // $postarray['uri'] = "twitter::".$post->retweeted_status->id_str; - //} - } - } + if (is_string($post->place->full_name)) { + $postarray["location"] = $post->place->full_name; + } + if (is_array($post->geo->coordinates)) { + $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; + } + if (is_array($post->coordinates->coordinates)) { + $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; + } + if (is_object($post->retweeted_status)) { + $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false); + + $retweet['contact-id'] = $postarray['contact-id']; + $retweet['owner-name'] = $postarray['owner-name']; + $retweet['owner-link'] = $postarray['owner-link']; + $retweet['owner-avatar'] = $postarray['owner-avatar']; + + $postarray = $retweet; + } + + if (is_object($post->quoted_status)) { + $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false); + + $postarray['body'] = $statustext; + + $postarray['body'] .= "\n".share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "", + $quoted['created'], $quoted['plink']); + + $postarray['body'] .= $quoted['body'].'[/share]'; + } + return($postarray); } @@ -1679,7 +1665,7 @@ function twitter_fetchhometimeline($a, $uid) { return; } - $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true); + $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"); //$parameters["count"] = 200; From bd791b95ac7a59140b66df0021d7a541677c7db6 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 9 Dec 2016 16:23:42 +0000 Subject: [PATCH 29/58] pump.io: Store the id, optimized SQL query --- pumpio/pumpio.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index f7786bee4..1b3c587f9 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -775,6 +775,10 @@ function pumpio_fetchtimeline(&$a, $uid) { $_REQUEST["profile_uid"] = $uid; $_REQUEST["source"] = "pump.io"; + if (isset($post->object->id)) { + $_REQUEST['message_id'] = NETWORK_PUMPIO.":".$post->object->id; + } + if ($post->object->displayName != "") $_REQUEST["title"] = html2bbcode($post->object->displayName); else @@ -1352,9 +1356,10 @@ function pumpio_fetchinbox(&$a, $uid) { $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($uid)); - $lastitems = q("SELECT uri FROM `item` WHERE `network` = '%s' AND `uid` = %d AND - `extid` != '' AND `id` = `parent` - ORDER BY `commented` DESC LIMIT 10", + $lastitems = q("SELECT `uri` FROM `thread` + INNER JOIN `item` ON `item`.`id` = `thread`.`iid` + WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != '' + ORDER BY `thread`.`commented` DESC LIMIT 10", dbesc(NETWORK_PUMPIO), intval($uid) ); From 9082f4c437e2fcc2a596968cd28485b500e8810c Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 10 Dec 2016 07:15:00 +0000 Subject: [PATCH 30/58] Twitter: Videos are embedded, mirrored posts are improved --- twitter/twitter.php | 148 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 28 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index e0148a11c..eab557d4b 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -734,6 +734,41 @@ function twitter_prepare_body(&$a,&$b) { } } +function twitter_do_mirrorpost($a, $uid, $post) { + $datarray["type"] = "wall"; + $datarray["api_source"] = true; + $datarray["profile_uid"] = $uid; + $datarray["extid"] = NETWORK_TWITTER; + $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id); + $datarray["title"] = ""; + + if (is_object($post->retweeted_status)) { + $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true); + + $datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", + $item['created'], $item['plink']); + + $datarray['body'] .= $item['body'].'[/share]'; + } else { + $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false); + + $datarray['body'] = $item['body']; + } + + $datarray["source"] = $item['app']; + $datarray["verb"] = $item['verb']; + + if (isset($item["location"])) { + $datarray["location"] = $item["location"]; + } + + if (isset($item["coord"])) { + $datarray["coord"] = $item["coord"]; + } + + return $datarray; +} + function twitter_fetchtimeline($a, $uid) { $ckey = get_config('twitter', 'consumerkey'); $csecret = get_config('twitter', 'consumersecret'); @@ -755,7 +790,8 @@ function twitter_fetchtimeline($a, $uid) { require_once('library/twitteroauth.php'); $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret); - $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true); + //$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true); + $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"); $first_time = ($lastid == ""); @@ -780,9 +816,13 @@ function twitter_fetchtimeline($a, $uid) { continue; if (!stristr($post->source, $application_name)) { + $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + $_REQUEST = twitter_do_mirrorpost($a, $uid, $post); + +/* unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; @@ -870,7 +910,7 @@ function twitter_fetchtimeline($a, $uid) { if (is_array($post->coordinates->coordinates)) $_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; - +*/ //print_r($_REQUEST); logger('twitter: posting for user '.$uid); @@ -1325,9 +1365,71 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) { return array("body" => $body, "tags" => $tags, "plain" => $plain); } -function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) { +/** + * @brief Fetch media entities and add media links to the body + * + * @param object $post Twitter object with the post + * @param array $postarray Array of the item that is about to be posted + * + * @return $picture string Returns a a single picture string if it isn't a media post + */ +function twitter_media_entities($post, &$postarray) { - $has_picture = false; + // There are no media entities? So we quit. + if (!is_array($post->extended_entities->media)) { + return ""; + } + + // When the post links to an external page, we only take one picture. + // This could be improved in the future. + if (count($post->entities->urls) > 0) { + $picture = ""; + foreach($post->extended_entities->media AS $medium) { + if (isset($medium->media_url_https)) { + $picture = $medium->media_url_https; + $postarray['body'] = str_replace($medium->url, "", $postarray['body']); + } + } + return $picture; + } + + // This is a pure media post, first search for all media urls + $media = array(); + foreach($post->extended_entities->media AS $medium) { + switch($medium->type) { + case 'photo': + $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]"; + $postarray['object-type'] = ACTIVITY_OBJ_IMAGE; + break; + case 'video': + case 'animated_gif': + $media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]"; + $postarray['object-type'] = ACTIVITY_OBJ_VIDEO; + if (is_array($medium->video_info->variants)) { + $bitrate = 0; + // We take the video with the highest bitrate + foreach ($medium->video_info->variants AS $variant) { + if (($variant->content_type == "video/mp4") AND ($variant->bitrate >= $bitrate)) { + $media[$medium->url] = "\n[video]".$variant->url."[/video]"; + $bitrate = $variant->bitrate; + } + } + } + break; + // The following code will only be activated for test reasons + //default: + // $postarray['body'] .= print_r($medium, true); + } + } + + // Now we replace the media urls. + foreach ($media AS $key => $value) { + $postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']); + } + return ""; +} + +function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) { $postarray = array(); $postarray['network'] = NETWORK_TWITTER; @@ -1436,25 +1538,14 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['body'] = $post->text; } - $picture = ""; - - // media - if (is_array($post->entities->media)) { - foreach($post->entities->media AS $media) { - switch($media->type) { - case 'photo': - //$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']); - //$has_picture = true; - $postarray['body'] = str_replace($media->url, "", $postarray['body']); - $postarray['object-type'] = ACTIVITY_OBJ_IMAGE; - $picture = $media->media_url_https; - break; - default: - $postarray['body'] .= print_r($media, true); - } - } + // When the post contains links then use the correct object type + if (count($post->entities->urls) > 0) { + $postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK; } + // Search for media links + $picture = twitter_media_entities($post, $postarray); + $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture); $postarray['body'] = $converted["body"]; $postarray['tag'] = $converted["tags"]; @@ -1476,8 +1567,9 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; } if (is_object($post->retweeted_status)) { - $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false); + $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote); + $retweet['object'] = $postarray['object']; $retweet['contact-id'] = $postarray['contact-id']; $retweet['owner-name'] = $postarray['owner-name']; $retweet['owner-link'] = $postarray['owner-link']; @@ -1486,8 +1578,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray = $retweet; } - if (is_object($post->quoted_status)) { - $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false); + if (is_object($post->quoted_status) AND !$noquote) { + $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true); $postarray['body'] = $statustext; @@ -1573,7 +1665,7 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) $posts = array(); while ($post->in_reply_to_status_id_str != "") { - $parameters = array("trim_user" => false, "id" => $post->in_reply_to_status_id_str); + $parameters = array("trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str); $post = $connection->get('statuses/show', $parameters); @@ -1599,7 +1691,7 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) if (count($posts)) { foreach ($posts as $post) { - $postarray = twitter_createpost($a, $uid, $post, $self, false, false); + $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false); if (trim($postarray['body']) == "") continue; @@ -1711,7 +1803,7 @@ function twitter_fetchhometimeline($a, $uid) { if ($post->in_reply_to_status_id_str != "") twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); - $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true); + $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false); if (trim($postarray['body']) == "") continue; @@ -1758,7 +1850,7 @@ function twitter_fetchhometimeline($a, $uid) { if ($post->in_reply_to_status_id_str != "") twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); - $postarray = twitter_createpost($a, $uid, $post, $self, false, false); + $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false); if (trim($postarray['body']) == "") continue; From 23a40fffd516cecdba3ace256b8fce8e24ad6976 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 10 Dec 2016 08:07:59 +0000 Subject: [PATCH 31/58] Improvement for posts with more than one media entity --- twitter/twitter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index eab557d4b..bc6d7bc1f 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -743,6 +743,7 @@ function twitter_do_mirrorpost($a, $uid, $post) { $datarray["title"] = ""; if (is_object($post->retweeted_status)) { + // We don't support nested shares, so we mustn't show quotes as shares on retweets $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true); $datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", @@ -1381,8 +1382,8 @@ function twitter_media_entities($post, &$postarray) { } // When the post links to an external page, we only take one picture. - // This could be improved in the future. - if (count($post->entities->urls) > 0) { + // We only do this when there is exactly one media. + if ((count($post->entities->urls) > 0) AND (count($post->extended_entities->media) == 1)) { $picture = ""; foreach($post->extended_entities->media AS $medium) { if (isset($medium->media_url_https)) { From 02cbdc6decccbfe8d2748dc1a560f2491605a520 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 10 Dec 2016 08:14:14 +0000 Subject: [PATCH 32/58] Clean up the code --- twitter/twitter.php | 101 ++++---------------------------------------- 1 file changed, 9 insertions(+), 92 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index bc6d7bc1f..0202a30b6 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -734,6 +734,15 @@ function twitter_prepare_body(&$a,&$b) { } } +/** + * @brief Build the item array for the mirrored post + * + * @param object $a Application class + * @param integer $uid User id + * @param object $post Twitter object with the post + * + * @return array item data to be posted + */ function twitter_do_mirrorpost($a, $uid, $post) { $datarray["type"] = "wall"; $datarray["api_source"] = true; @@ -823,100 +832,8 @@ function twitter_fetchtimeline($a, $uid) { $_REQUEST = twitter_do_mirrorpost($a, $uid, $post); -/* - unset($_REQUEST); - $_REQUEST["type"] = "wall"; - $_REQUEST["api_source"] = true; - $_REQUEST["profile_uid"] = $uid; - //$_REQUEST["source"] = "Twitter"; - $_REQUEST["source"] = $post->source; - $_REQUEST["extid"] = NETWORK_TWITTER; - - if (isset($post->id)) { - $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id); - } - - //$_REQUEST["date"] = $post->created_at; - - $_REQUEST["title"] = ""; - - if (is_object($post->retweeted_status)) { - - $_REQUEST['body'] = $post->retweeted_status->text; - - $picture = ""; - - // media - if (is_array($post->retweeted_status->entities->media)) { - foreach($post->retweeted_status->entities->media AS $media) { - switch($media->type) { - case 'photo': - //$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']); - //$has_picture = true; - $_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']); - $picture = $media->media_url_https; - break; - } - } - } - - $converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $picture); - $_REQUEST['body'] = $converted["body"]; - - if (function_exists("share_header")) - $_REQUEST['body'] = share_header($post->retweeted_status->user->name, "https://twitter.com/".$post->retweeted_status->user->screen_name, - $post->retweeted_status->user->profile_image_url_https, "", - datetime_convert('UTC','UTC',$post->retweeted_status->created_at), - "https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str). - $_REQUEST['body']; - else - $_REQUEST['body'] = "[share author='".$post->retweeted_status->user->name. - "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name. - "' avatar='".$post->retweeted_status->user->profile_image_url_https. - "' posted='".datetime_convert('UTC','UTC',$post->retweeted_status->created_at). - "' link='https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str."']". - $_REQUEST['body']; - - $_REQUEST['body'] .= "[/share]"; - } else { - $_REQUEST["body"] = $post->text; - - $picture = ""; - - if (is_array($post->entities->media)) { - foreach($post->entities->media AS $media) { - switch($media->type) { - case 'photo': - //$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']); - //$has_picture = true; - $_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']); - $picture = $media->media_url_https; - break; - } - } - } - - $converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $picture); - $_REQUEST['body'] = $converted["body"]; - } - - if (is_string($post->place->name)) - $_REQUEST["location"] = $post->place->name; - - if (is_string($post->place->full_name)) - $_REQUEST["location"] = $post->place->full_name; - - if (is_array($post->geo->coordinates)) - $_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; - - if (is_array($post->coordinates->coordinates)) - $_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; -*/ - //print_r($_REQUEST); logger('twitter: posting for user '.$uid); -// require_once('mod/item.php'); - item_post($a); } } From cb4b8b51840ae2ff7964d71a50ce425d0bd15963 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 10 Dec 2016 11:15:37 +0000 Subject: [PATCH 33/58] Passthrough some more fields --- twitter/twitter.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/twitter/twitter.php b/twitter/twitter.php index 0202a30b6..e862fc7ac 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1357,6 +1357,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['uri'] = "twitter::".$post->id_str; $postarray['object'] = json_encode($post); + // Don't import our own comments $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($postarray['uri']), intval($uid) @@ -1488,6 +1489,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote); $retweet['object'] = $postarray['object']; + $retweet['private'] = $postarray['private']; + $retweet['allow_cid'] = $postarray['allow_cid']; $retweet['contact-id'] = $postarray['contact-id']; $retweet['owner-name'] = $postarray['owner-name']; $retweet['owner-link'] = $postarray['owner-link']; From c0edd9eca861c71b1a8e04f607efb05198ea1416 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 10 Dec 2016 11:17:26 +0000 Subject: [PATCH 34/58] Remove some comments --- twitter/twitter.php | 1 - 1 file changed, 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index e862fc7ac..253ed4ab1 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -800,7 +800,6 @@ function twitter_fetchtimeline($a, $uid) { require_once('library/twitteroauth.php'); $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret); - //$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true); $parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended"); $first_time = ($lastid == ""); From 94de3b751ec9e046f0cce27abd925c081822bb8f Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 12 Dec 2016 23:40:28 +0000 Subject: [PATCH 35/58] Twitter: Mirrored retweets sometimes were empty --- twitter/twitter.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 253ed4ab1..52c99c297 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -749,11 +749,12 @@ function twitter_do_mirrorpost($a, $uid, $post) { $datarray["profile_uid"] = $uid; $datarray["extid"] = NETWORK_TWITTER; $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id); + $datarray['object'] = json_encode($post); $datarray["title"] = ""; if (is_object($post->retweeted_status)) { // We don't support nested shares, so we mustn't show quotes as shares on retweets - $item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true); + $item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true); $datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", $item['created'], $item['plink']); @@ -1363,6 +1364,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing ); if (count($r)) { + logger("Item with extid ".$postarray['uri']." found.", LOGGER_DEBUG); return(array()); } @@ -1412,6 +1414,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing $postarray['owner-link'] = $r[0]["url"]; $postarray['owner-avatar'] = $r[0]["photo"]; } else { + logger("No self contact for user ".$uid, LOGGER_DEBUG); return(array()); } } @@ -1433,6 +1436,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing if(($contactid == 0) AND !$only_existing_contact) { $contactid = $self['id']; } elseif ($contactid <= 0) { + logger("Contact ID is zero or less than zero.", LOGGER_DEBUG); return(array()); } From d48e8bd0a9fd20ac70bd758f8a407b7988155c85 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 13 Dec 2016 08:57:03 +0000 Subject: [PATCH 36/58] Twitter: Post links with pictures if available --- twitter/twitter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 253ed4ab1..c37da0532 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -494,7 +494,8 @@ function twitter_post_hook(&$a,&$b) { if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo")) $msg .= "\n".$msgarr["url"]; - elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video")) + + if (isset($msgarr["image"]) AND ($msgarr["type"] != "video")) $image = $msgarr["image"]; // and now tweet it :-) From 3f90814e30ba737f7f32827afeffb1e11a3b80d6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 17 Dec 2016 16:32:31 +0000 Subject: [PATCH 37/58] Remove the "MyISAM" from the SQL scripts - this engine is outdated. --- mailstream/database.sql | 2 +- retriever/database.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mailstream/database.sql b/mailstream/database.sql index 1c6d168a8..7ce7b64e5 100644 --- a/mailstream/database.sql +++ b/mailstream/database.sql @@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `mailstream_item` ( KEY `message-id` (`message-id`), KEY `created` (`created`), KEY `completed` (`completed`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) DEFAULT CHARSET=utf8 COLLATE=utf8_bin; diff --git a/retriever/database.sql b/retriever/database.sql index 1661c1696..23cac1207 100644 --- a/retriever/database.sql +++ b/retriever/database.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `retriever_rule` ( PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `contact-id` (`contact-id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) DEFAULT CHARSET=utf8 COLLATE=utf8_bin; CREATE TABLE IF NOT EXISTS `retriever_item` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, @@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `retriever_item` ( KEY `resource` (`resource`), KEY `all` (`item-uri`, `item-uid`, `contact-id`), PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +) DEFAULT CHARSET=utf8 COLLATE=utf8_bin; CREATE TABLE IF NOT EXISTS `retriever_resource` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, @@ -33,4 +33,4 @@ CREATE TABLE IF NOT EXISTS `retriever_resource` ( `http-code` smallint(1) unsigned NULL DEFAULT NULL, `redirect-url` varchar(800) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin +) DEFAULT CHARSET=utf8 COLLATE=utf8_bin From 9f18d7e6ded53ce9338c624ed4228315581fb217 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 25 Dec 2016 23:39:23 +0000 Subject: [PATCH 38/58] Twitter: The sync process is split into several short processes --- twitter/twitter.php | 13 +++++-- twitter/twitter_sync.php | 78 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 twitter/twitter_sync.php diff --git a/twitter/twitter.php b/twitter/twitter.php index 934b8d3ce..0f074ba31 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -625,7 +625,12 @@ function twitter_cron($a,$b) { if(count($r)) { foreach($r as $rr) { logger('twitter: fetching for user '.$rr['uid']); - twitter_fetchtimeline($a, $rr['uid']); + + if (get_config("system", "worker")) { + proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, $rr['uid']); + } else { + twitter_fetchtimeline($a, $rr['uid']); + } } } @@ -647,8 +652,12 @@ function twitter_cron($a,$b) { } logger('twitter: importing timeline from user '.$rr['uid']); - twitter_fetchhometimeline($a, $rr["uid"]); + if (get_config("system", "worker")) { + proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, $rr['uid']); + } else { + twitter_fetchhometimeline($a, $rr["uid"]); + } /* // To-Do // check for new contacts once a day diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php new file mode 100644 index 000000000..e8987f8f6 --- /dev/null +++ b/twitter/twitter_sync.php @@ -0,0 +1,78 @@ + $maxsysload) { + logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.'); + return; + } + } + + if ($argc < 3) { + return; + } + + $mode = intval($argv[1]); + $uid = intval($argv[2]); + + /// @todo Replace it with "App::is_already_running" in the next release + $lockpath = get_lockpath(); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); + if($pidfile->is_already_running()) { + logger("Already running"); + if ($pidfile->running_time() > 9*60) { + $pidfile->kill(); + logger("killed stale process"); + // Calling a new instance + proc_run('php','addon/twitter/twitter_sync.php', $mode, $uid); + } + exit; + } + } + + if ($mode == 1) { + twitter_fetchtimeline($a, $uid); + } elseif ($mode == 2) { + twitter_fetchhometimeline($a, $uid); + } +} + +if (array_search(__file__,get_included_files())===0){ + twitter_sync_run($_SERVER["argv"],$_SERVER["argc"]); + killme(); +} +?> From bacb6b379bd8f58fec7b2164aadc2d3dffd622e9 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 28 Dec 2016 03:28:26 +0000 Subject: [PATCH 39/58] Standards --- twitter/twitter_sync.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php index e8987f8f6..434cb2042 100644 --- a/twitter/twitter_sync.php +++ b/twitter/twitter_sync.php @@ -16,11 +16,11 @@ require_once("boot.php"); function twitter_sync_run($argv, $argc){ global $a, $db; - if(is_null($a)) { + if (is_null($a)) { $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -31,11 +31,12 @@ function twitter_sync_run($argv, $argc){ require_once("include/pidfile.php"); $maxsysload = intval(get_config('system','maxloadavg')); - if($maxsysload < 1) + if ($maxsysload < 1) { $maxsysload = 50; - if(function_exists('sys_getloadavg')) { + } + if (function_exists('sys_getloadavg')) { $load = sys_getloadavg(); - if(intval($load[0]) > $maxsysload) { + if (intval($load[0]) > $maxsysload) { logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.'); return; } @@ -52,7 +53,7 @@ function twitter_sync_run($argv, $argc){ $lockpath = get_lockpath(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); - if($pidfile->is_already_running()) { + if ($pidfile->is_already_running()) { logger("Already running"); if ($pidfile->running_time() > 9*60) { $pidfile->kill(); From 3a976595d595b7b56ef3cf28e3520b27ae5da5f8 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 8 Jan 2017 16:18:16 +0100 Subject: [PATCH 40/58] mailstream: update PHPMailer to v5.2.21 --- mailstream/class.phpmailer.php | 2826 --------------- mailstream/mailstream.php | 679 ++-- mailstream/phpmailer/LICENSE | 504 +++ mailstream/phpmailer/VERSION | 1 + mailstream/phpmailer/class.phpmailer.php | 4025 ++++++++++++++++++++++ 5 files changed, 4869 insertions(+), 3166 deletions(-) delete mode 100644 mailstream/class.phpmailer.php create mode 100644 mailstream/phpmailer/LICENSE create mode 100644 mailstream/phpmailer/VERSION create mode 100644 mailstream/phpmailer/class.phpmailer.php diff --git a/mailstream/class.phpmailer.php b/mailstream/class.phpmailer.php deleted file mode 100644 index 99c0d783a..000000000 --- a/mailstream/class.phpmailer.php +++ /dev/null @@ -1,2826 +0,0 @@ -UseSendmailOptions) ) { - $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header); - } else { - $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header, $params); - } - return $rt; - } - - /** - * Outputs debugging info via user-defined method - * @param string $str - */ - private function edebug($str) { - if ($this->Debugoutput == "error_log") { - error_log($str); - } else { - echo $str; - } - } - - /** - * Constructor - * @param boolean $exceptions Should we throw external exceptions? - */ - public function __construct($exceptions = false) { - $this->exceptions = ($exceptions == true); - } - - /** - * Sets message type to HTML. - * @param bool $ishtml - * @return void - */ - public function IsHTML($ishtml = true) { - if ($ishtml) { - $this->ContentType = 'text/html'; - } else { - $this->ContentType = 'text/plain'; - } - } - - /** - * Sets Mailer to send message using SMTP. - * @return void - */ - public function IsSMTP() { - $this->Mailer = 'smtp'; - } - - /** - * Sets Mailer to send message using PHP mail() function. - * @return void - */ - public function IsMail() { - $this->Mailer = 'mail'; - } - - /** - * Sets Mailer to send message using the $Sendmail program. - * @return void - */ - public function IsSendmail() { - if (!stristr(ini_get('sendmail_path'), 'sendmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; - } - $this->Mailer = 'sendmail'; - } - - /** - * Sets Mailer to send message using the qmail MTA. - * @return void - */ - public function IsQmail() { - if (stristr(ini_get('sendmail_path'), 'qmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; - } - $this->Mailer = 'sendmail'; - } - - ///////////////////////////////////////////////// - // METHODS, RECIPIENTS - ///////////////////////////////////////////////// - - /** - * Adds a "To" address. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddAddress($address, $name = '') { - return $this->AddAnAddress('to', $address, $name); - } - - /** - * Adds a "Cc" address. - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddCC($address, $name = '') { - return $this->AddAnAddress('cc', $address, $name); - } - - /** - * Adds a "Bcc" address. - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddBCC($address, $name = '') { - return $this->AddAnAddress('bcc', $address, $name); - } - - /** - * Adds a "Reply-to" address. - * @param string $address - * @param string $name - * @return boolean - */ - public function AddReplyTo($address, $name = '') { - return $this->AddAnAddress('Reply-To', $address, $name); - } - - /** - * Adds an address to one of the recipient arrays - * Addresses that have been added already return false, but do not throw exceptions - * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' - * @param string $address The email address to send to - * @param string $name - * @throws phpmailerException - * @return boolean true on success, false if address already used or invalid in some way - * @access protected - */ - protected function AddAnAddress($kind, $address, $name = '') { - if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) { - $this->SetError($this->Lang('Invalid recipient array').': '.$kind); - if ($this->exceptions) { - throw new phpmailerException('Invalid recipient array: ' . $kind); - } - if ($this->SMTPDebug) { - $this->edebug($this->Lang('Invalid recipient array').': '.$kind); - } - return false; - } - $address = trim($address); - $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (!$this->ValidateAddress($address)) { - $this->SetError($this->Lang('invalid_address').': '. $address); - if ($this->exceptions) { - throw new phpmailerException($this->Lang('invalid_address').': '.$address); - } - if ($this->SMTPDebug) { - $this->edebug($this->Lang('invalid_address').': '.$address); - } - return false; - } - if ($kind != 'Reply-To') { - if (!isset($this->all_recipients[strtolower($address)])) { - array_push($this->$kind, array($address, $name)); - $this->all_recipients[strtolower($address)] = true; - return true; - } - } else { - if (!array_key_exists(strtolower($address), $this->ReplyTo)) { - $this->ReplyTo[strtolower($address)] = array($address, $name); - return true; - } - } - return false; -} - -/** - * Set the From and FromName properties - * @param string $address - * @param string $name - * @param int $auto Also set Reply-To and Sender - * @throws phpmailerException - * @return boolean - */ - public function SetFrom($address, $name = '', $auto = 1) { - $address = trim($address); - $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (!$this->ValidateAddress($address)) { - $this->SetError($this->Lang('invalid_address').': '. $address); - if ($this->exceptions) { - throw new phpmailerException($this->Lang('invalid_address').': '.$address); - } - if ($this->SMTPDebug) { - $this->edebug($this->Lang('invalid_address').': '.$address); - } - return false; - } - $this->From = $address; - $this->FromName = $name; - if ($auto) { - if (empty($this->ReplyTo)) { - $this->AddAnAddress('Reply-To', $address, $name); - } - if (empty($this->Sender)) { - $this->Sender = $address; - } - } - return true; - } - - /** - * Check that a string looks roughly like an email address should - * Static so it can be used without instantiation, public so people can overload - * Conforms to RFC5322: Uses *correct* regex on which FILTER_VALIDATE_EMAIL is - * based; So why not use FILTER_VALIDATE_EMAIL? Because it was broken to - * not allow a@b type valid addresses :( - * Some Versions of PHP break on the regex though, likely due to PCRE, so use - * the older validation method for those users. (http://php.net/manual/en/pcre.installation.php) - * @link http://squiloople.com/2009/12/20/email-address-validation/ - * @copyright regex Copyright Michael Rushton 2009-10 | http://squiloople.com/ | Feel free to use and redistribute this code. But please keep this copyright notice. - * @param string $address The email address to check - * @return boolean - * @static - * @access public - */ - public static function ValidateAddress($address) { - if ((defined('PCRE_VERSION')) && (version_compare(PCRE_VERSION, '8.0') >= 0)) { - return preg_match('/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)((?>(?>(?>((?>(?>(?>\x0D\x0A)?[ ])+|(?>[ ]*\x0D\x0A)?[ ]+)?)(\((?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}|(?!(?:.*[a-f0-9][:\]]){7,})((?6)(?>:(?6)){0,5})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:|(?!(?:.*[a-f0-9]:){5,})(?8)?::(?>((?6)(?>:(?6)){0,3}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', $address); - } elseif (function_exists('filter_var')) { //Introduced in PHP 5.2 - if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { - return false; - } else { - return true; - } - } else { - return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address); - } - } - - ///////////////////////////////////////////////// - // METHODS, MAIL SENDING - ///////////////////////////////////////////////// - - /** - * Creates message and assigns Mailer. If the message is - * not sent successfully then it returns false. Use the ErrorInfo - * variable to view description of the error. - * @throws phpmailerException - * @return bool - */ - public function Send() { - try { - if(!$this->PreSend()) return false; - return $this->PostSend(); - } catch (phpmailerException $e) { - $this->mailHeader = ''; - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - return false; - } - } - - /** - * Prep mail by constructing all message entities - * @throws phpmailerException - * @return bool - */ - public function PreSend() { - try { - $this->mailHeader = ""; - if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { - throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL); - } - - // Set whether the message is multipart/alternative - if(!empty($this->AltBody)) { - $this->ContentType = 'multipart/alternative'; - } - - $this->error_count = 0; // reset errors - $this->SetMessageType(); - //Refuse to send an empty message - if (empty($this->Body)) { - throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL); - } - - $this->MIMEHeader = $this->CreateHeader(); - $this->MIMEBody = $this->CreateBody(); - - // To capture the complete message when using mail(), create - // an extra header list which CreateHeader() doesn't fold in - if ($this->Mailer == 'mail') { - if (count($this->to) > 0) { - $this->mailHeader .= $this->AddrAppend("To", $this->to); - } else { - $this->mailHeader .= $this->HeaderLine("To", "undisclosed-recipients:;"); - } - $this->mailHeader .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader(trim($this->Subject)))); - // if(count($this->cc) > 0) { - // $this->mailHeader .= $this->AddrAppend("Cc", $this->cc); - // } - } - - // digitally sign with DKIM if enabled - if (!empty($this->DKIM_domain) && !empty($this->DKIM_private) && !empty($this->DKIM_selector) && !empty($this->DKIM_domain) && file_exists($this->DKIM_private)) { - $header_dkim = $this->DKIM_Add($this->MIMEHeader, $this->EncodeHeader($this->SecureHeader($this->Subject)), $this->MIMEBody); - $this->MIMEHeader = str_replace("\r\n", "\n", $header_dkim) . $this->MIMEHeader; - } - - return true; - - } catch (phpmailerException $e) { - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - return false; - } - } - - /** - * Actual Email transport function - * Send the email via the selected mechanism - * @throws phpmailerException - * @return bool - */ - public function PostSend() { - try { - // Choose the mailer and send through it - switch($this->Mailer) { - case 'sendmail': - return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody); - case 'smtp': - return $this->SmtpSend($this->MIMEHeader, $this->MIMEBody); - case 'mail': - return $this->MailSend($this->MIMEHeader, $this->MIMEBody); - default: - return $this->MailSend($this->MIMEHeader, $this->MIMEBody); - } - } catch (phpmailerException $e) { - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - if ($this->SMTPDebug) { - $this->edebug($e->getMessage()."\n"); - } - } - return false; - } - - /** - * Sends mail using the $Sendmail program. - * @param string $header The message headers - * @param string $body The message body - * @throws phpmailerException - * @access protected - * @return bool - */ - protected function SendmailSend($header, $body) { - if ($this->Sender != '') { - $sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); - } else { - $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail)); - } - if ($this->SingleTo === true) { - foreach ($this->SingleToArray as $val) { - if(!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - fputs($mail, "To: " . $val . "\n"); - fputs($mail, $header); - fputs($mail, $body); - $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body); - if($result != 0) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - } - } else { - if(!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - fputs($mail, $header); - fputs($mail, $body); - $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body); - if($result != 0) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - } - return true; - } - - /** - * Sends mail using the PHP mail() function. - * @param string $header The message headers - * @param string $body The message body - * @throws phpmailerException - * @access protected - * @return bool - */ - protected function MailSend($header, $body) { - $toArr = array(); - foreach($this->to as $t) { - $toArr[] = $this->AddrFormat($t); - } - $to = implode(', ', $toArr); - - if (empty($this->Sender)) { - $params = "-oi "; - } else { - $params = sprintf("-oi -f%s", $this->Sender); - } - if ($this->Sender != '' and !ini_get('safe_mode')) { - $old_from = ini_get('sendmail_from'); - ini_set('sendmail_from', $this->Sender); - } - $rt = false; - if ($this->SingleTo === true && count($toArr) > 1) { - foreach ($toArr as $val) { - $rt = $this->mail_passthru($val, $this->Subject, $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body); - } - } else { - $rt = $this->mail_passthru($to, $this->Subject, $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body); - } - if (isset($old_from)) { - ini_set('sendmail_from', $old_from); - } - if(!$rt) { - throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL); - } - return true; - } - - /** - * Sends mail via SMTP using PhpSMTP - * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. - * @param string $header The message headers - * @param string $body The message body - * @throws phpmailerException - * @uses SMTP - * @access protected - * @return bool - */ - protected function SmtpSend($header, $body) { - require_once $this->PluginDir . 'class.smtp.php'; - $bad_rcpt = array(); - - if(!$this->SmtpConnect()) { - throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL); - } - $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender; - if(!$this->smtp->Mail($smtp_from)) { - $this->SetError($this->Lang('from_failed') . $smtp_from . " : " . implode(",",$this->smtp->getError())) ; - throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); - } - - // Attempt to send attach all recipients - foreach($this->to as $to) { - if (!$this->smtp->Recipient($to[0])) { - $bad_rcpt[] = $to[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body); - } - } - foreach($this->cc as $cc) { - if (!$this->smtp->Recipient($cc[0])) { - $bad_rcpt[] = $cc[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body); - } - } - foreach($this->bcc as $bcc) { - if (!$this->smtp->Recipient($bcc[0])) { - $bad_rcpt[] = $bcc[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body); - } - } - - - if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses - $badaddresses = implode(', ', $bad_rcpt); - throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses); - } - if(!$this->smtp->Data($header . $body)) { - throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL); - } - if($this->SMTPKeepAlive == true) { - $this->smtp->Reset(); - } else { - $this->smtp->Quit(); - $this->smtp->Close(); - } - return true; - } - - /** - * Initiates a connection to an SMTP server. - * Returns false if the operation failed. - * @uses SMTP - * @access public - * @throws phpmailerException - * @return bool - */ - public function SmtpConnect() { - if(is_null($this->smtp)) { - $this->smtp = new SMTP; - } - - $this->smtp->Timeout = $this->Timeout; - $this->smtp->do_debug = $this->SMTPDebug; - $hosts = explode(';', $this->Host); - $index = 0; - $connection = $this->smtp->Connected(); - - // Retry while there is no connection - try { - while($index < count($hosts) && !$connection) { - $hostinfo = array(); - if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) { - $host = $hostinfo[1]; - $port = $hostinfo[2]; - } else { - $host = $hosts[$index]; - $port = $this->Port; - } - - $tls = ($this->SMTPSecure == 'tls'); - $ssl = ($this->SMTPSecure == 'ssl'); - - if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) { - - $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); - $this->smtp->Hello($hello); - - if ($tls) { - if (!$this->smtp->StartTLS()) { - throw new phpmailerException($this->Lang('connect_host')); - } - - //We must resend HELO after tls negotiation - $this->smtp->Hello($hello); - } - - $connection = true; - if ($this->SMTPAuth) { - if (!$this->smtp->Authenticate($this->Username, $this->Password, $this->AuthType, - $this->Realm, $this->Workstation)) { - throw new phpmailerException($this->Lang('authenticate')); - } - } - } - $index++; - if (!$connection) { - throw new phpmailerException($this->Lang('connect_host')); - } - } - } catch (phpmailerException $e) { - $this->smtp->Reset(); - if ($this->exceptions) { - throw $e; - } - } - return true; - } - - /** - * Closes the active SMTP session if one exists. - * @return void - */ - public function SmtpClose() { - if ($this->smtp !== null) { - if($this->smtp->Connected()) { - $this->smtp->Quit(); - $this->smtp->Close(); - } - } - } - - /** - * Sets the language for all class error messages. - * Returns false if it cannot load the language file. The default language is English. - * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br") - * @param string $lang_path Path to the language file directory - * @return bool - * @access public - */ - function SetLanguage($langcode = 'en', $lang_path = 'language/') { - //Define full set of translatable strings - $PHPMAILER_LANG = array( - 'authenticate' => 'SMTP Error: Could not authenticate.', - 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', - 'data_not_accepted' => 'SMTP Error: Data not accepted.', - 'empty_message' => 'Message body empty', - 'encoding' => 'Unknown encoding: ', - 'execute' => 'Could not execute: ', - 'file_access' => 'Could not access file: ', - 'file_open' => 'File Error: Could not open file: ', - 'from_failed' => 'The following From address failed: ', - 'instantiate' => 'Could not instantiate mail function.', - 'invalid_address' => 'Invalid address', - 'mailer_not_supported' => ' mailer is not supported.', - 'provide_address' => 'You must provide at least one recipient email address.', - 'recipients_failed' => 'SMTP Error: The following recipients failed: ', - 'signing' => 'Signing Error: ', - 'smtp_connect_failed' => 'SMTP Connect() failed.', - 'smtp_error' => 'SMTP server error: ', - 'variable_set' => 'Cannot set or reset variable: ' - ); - //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"! - $l = true; - if ($langcode != 'en') { //There is no English translation file - $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php'; - } - $this->language = $PHPMAILER_LANG; - return ($l == true); //Returns false if language not found - } - - /** - * Return the current array of language strings - * @return array - */ - public function GetTranslations() { - return $this->language; - } - - ///////////////////////////////////////////////// - // METHODS, MESSAGE CREATION - ///////////////////////////////////////////////// - - /** - * Creates recipient headers. - * @access public - * @param string $type - * @param array $addr - * @return string - */ - public function AddrAppend($type, $addr) { - $addr_str = $type . ': '; - $addresses = array(); - foreach ($addr as $a) { - $addresses[] = $this->AddrFormat($a); - } - $addr_str .= implode(', ', $addresses); - $addr_str .= $this->LE; - - return $addr_str; - } - - /** - * Formats an address correctly. - * @access public - * @param string $addr - * @return string - */ - public function AddrFormat($addr) { - if (empty($addr[1])) { - return $this->SecureHeader($addr[0]); - } else { - return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">"; - } - } - - /** - * Wraps message for use with mailers that do not - * automatically perform wrapping and for quoted-printable. - * Original written by philippe. - * @param string $message The message to wrap - * @param integer $length The line length to wrap to - * @param boolean $qp_mode Whether to run in Quoted-Printable mode - * @access public - * @return string - */ - public function WrapText($message, $length, $qp_mode = false) { - $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE; - // If utf-8 encoding is used, we will need to make sure we don't - // split multibyte characters when we wrap - $is_utf8 = (strtolower($this->CharSet) == "utf-8"); - $lelen = strlen($this->LE); - $crlflen = strlen(self::CRLF); - - $message = $this->FixEOL($message); - if (substr($message, -$lelen) == $this->LE) { - $message = substr($message, 0, -$lelen); - } - - $line = explode($this->LE, $message); // Magic. We know FixEOL uses $LE - $message = ''; - for ($i = 0 ;$i < count($line); $i++) { - $line_part = explode(' ', $line[$i]); - $buf = ''; - for ($e = 0; $e $length)) { - $space_left = $length - strlen($buf) - $crlflen; - if ($e != 0) { - if ($space_left > 20) { - $len = $space_left; - if ($is_utf8) { - $len = $this->UTF8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { - $len--; - } elseif (substr($word, $len - 2, 1) == "=") { - $len -= 2; - } - $part = substr($word, 0, $len); - $word = substr($word, $len); - $buf .= ' ' . $part; - $message .= $buf . sprintf("=%s", self::CRLF); - } else { - $message .= $buf . $soft_break; - } - $buf = ''; - } - while (strlen($word) > 0) { - $len = $length; - if ($is_utf8) { - $len = $this->UTF8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { - $len--; - } elseif (substr($word, $len - 2, 1) == "=") { - $len -= 2; - } - $part = substr($word, 0, $len); - $word = substr($word, $len); - - if (strlen($word) > 0) { - $message .= $part . sprintf("=%s", self::CRLF); - } else { - $buf = $part; - } - } - } else { - $buf_o = $buf; - $buf .= ($e == 0) ? $word : (' ' . $word); - - if (strlen($buf) > $length and $buf_o != '') { - $message .= $buf_o . $soft_break; - $buf = $word; - } - } - } - $message .= $buf . self::CRLF; - } - - return $message; - } - - /** - * Finds last character boundary prior to maxLength in a utf-8 - * quoted (printable) encoded string. - * Original written by Colin Brown. - * @access public - * @param string $encodedText utf-8 QP text - * @param int $maxLength find last character boundary prior to this length - * @return int - */ - public function UTF8CharBoundary($encodedText, $maxLength) { - $foundSplitPos = false; - $lookBack = 3; - while (!$foundSplitPos) { - $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); - $encodedCharPos = strpos($lastChunk, "="); - if ($encodedCharPos !== false) { - // Found start of encoded character byte within $lookBack block. - // Check the encoded byte value (the 2 chars after the '=') - $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); - $dec = hexdec($hex); - if ($dec < 128) { // Single byte character. - // If the encoded char was found at pos 0, it will fit - // otherwise reduce maxLength to start of the encoded char - $maxLength = ($encodedCharPos == 0) ? $maxLength : - $maxLength - ($lookBack - $encodedCharPos); - $foundSplitPos = true; - } elseif ($dec >= 192) { // First byte of a multi byte character - // Reduce maxLength to split at start of character - $maxLength = $maxLength - ($lookBack - $encodedCharPos); - $foundSplitPos = true; - } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back - $lookBack += 3; - } - } else { - // No encoded character found - $foundSplitPos = true; - } - } - return $maxLength; - } - - - /** - * Set the body wrapping. - * @access public - * @return void - */ - public function SetWordWrap() { - if($this->WordWrap < 1) { - return; - } - - switch($this->message_type) { - case 'alt': - case 'alt_inline': - case 'alt_attach': - case 'alt_inline_attach': - $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap); - break; - default: - $this->Body = $this->WrapText($this->Body, $this->WordWrap); - break; - } - } - - /** - * Assembles message header. - * @access public - * @return string The assembled header - */ - public function CreateHeader() { - $result = ''; - - // Set the boundaries - $uniq_id = md5(uniqid(time())); - $this->boundary[1] = 'b1_' . $uniq_id; - $this->boundary[2] = 'b2_' . $uniq_id; - $this->boundary[3] = 'b3_' . $uniq_id; - - if ($this->MessageDate == '') { - $result .= $this->HeaderLine('Date', self::RFCDate()); - } else { - $result .= $this->HeaderLine('Date', $this->MessageDate); - } - - if ($this->ReturnPath) { - $result .= $this->HeaderLine('Return-Path', trim($this->ReturnPath)); - } elseif ($this->Sender == '') { - $result .= $this->HeaderLine('Return-Path', trim($this->From)); - } else { - $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); - } - - // To be created automatically by mail() - if($this->Mailer != 'mail') { - if ($this->SingleTo === true) { - foreach($this->to as $t) { - $this->SingleToArray[] = $this->AddrFormat($t); - } - } else { - if(count($this->to) > 0) { - $result .= $this->AddrAppend('To', $this->to); - } elseif (count($this->cc) == 0) { - $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); - } - } - } - - $from = array(); - $from[0][0] = trim($this->From); - $from[0][1] = $this->FromName; - $result .= $this->AddrAppend('From', $from); - - // sendmail and mail() extract Cc from the header before sending - if(count($this->cc) > 0) { - $result .= $this->AddrAppend('Cc', $this->cc); - } - - // sendmail and mail() extract Bcc from the header before sending - if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { - $result .= $this->AddrAppend('Bcc', $this->bcc); - } - - if(count($this->ReplyTo) > 0) { - $result .= $this->AddrAppend('Reply-To', $this->ReplyTo); - } - - // mail() sets the subject itself - if($this->Mailer != 'mail') { - $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject))); - } - - if($this->MessageID != '') { - $result .= $this->HeaderLine('Message-ID', $this->MessageID); - } else { - $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); - } - $result .= $this->HeaderLine('X-Priority', $this->Priority); - if ($this->XMailer == '') { - $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (http://code.google.com/a/apache-extras.org/p/phpmailer/)'); - } else { - $myXmailer = trim($this->XMailer); - if ($myXmailer) { - $result .= $this->HeaderLine('X-Mailer', $myXmailer); - } - } - - if($this->ConfirmReadingTo != '') { - $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); - } - - // Add custom headers - for($index = 0; $index < count($this->CustomHeader); $index++) { - $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); - } - if (!$this->sign_key_file) { - $result .= $this->HeaderLine('MIME-Version', '1.0'); - $result .= $this->GetMailMIME(); - } - - return $result; - } - - /** - * Returns the message MIME. - * @access public - * @return string - */ - public function GetMailMIME() { - $result = ''; - switch($this->message_type) { - case 'inline': - $result .= $this->HeaderLine('Content-Type', 'multipart/related;'); - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); - break; - case 'attach': - case 'inline_attach': - case 'alt_attach': - case 'alt_inline_attach': - $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); - break; - case 'alt': - case 'alt_inline': - $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); - break; - default: - // Catches case 'plain': and case '': - $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding); - $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet); - break; - } - - if($this->Mailer != 'mail') { - $result .= $this->LE; - } - - return $result; - } - - /** - * Returns the MIME message (headers and body). Only really valid post PreSend(). - * @access public - * @return string - */ - public function GetSentMIMEMessage() { - return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody; - } - - - /** - * Assembles the message body. Returns an empty string on failure. - * @access public - * @throws phpmailerException - * @return string The assembled message body - */ - public function CreateBody() { - $body = ''; - - if ($this->sign_key_file) { - $body .= $this->GetMailMIME().$this->LE; - } - - $this->SetWordWrap(); - - switch($this->message_type) { - case 'inline': - $body .= $this->GetBoundary($this->boundary[1], '', '', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->AttachAll("inline", $this->boundary[1]); - break; - case 'attach': - $body .= $this->GetBoundary($this->boundary[1], '', '', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->AttachAll("attachment", $this->boundary[1]); - break; - case 'inline_attach': - $body .= $this->TextLine("--" . $this->boundary[1]); - $body .= $this->HeaderLine('Content-Type', 'multipart/related;'); - $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; - $body .= $this->GetBoundary($this->boundary[2], '', '', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->AttachAll("inline", $this->boundary[2]); - $body .= $this->LE; - $body .= $this->AttachAll("attachment", $this->boundary[1]); - break; - case 'alt': - $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', ''); - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->EndBoundary($this->boundary[1]); - break; - case 'alt_inline': - $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', ''); - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->TextLine("--" . $this->boundary[1]); - $body .= $this->HeaderLine('Content-Type', 'multipart/related;'); - $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; - $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->AttachAll("inline", $this->boundary[2]); - $body .= $this->LE; - $body .= $this->EndBoundary($this->boundary[1]); - break; - case 'alt_attach': - $body .= $this->TextLine("--" . $this->boundary[1]); - $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); - $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; - $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', ''); - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->EndBoundary($this->boundary[2]); - $body .= $this->LE; - $body .= $this->AttachAll("attachment", $this->boundary[1]); - break; - case 'alt_inline_attach': - $body .= $this->TextLine("--" . $this->boundary[1]); - $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); - $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; - $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', ''); - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->TextLine("--" . $this->boundary[2]); - $body .= $this->HeaderLine('Content-Type', 'multipart/related;'); - $body .= $this->TextLine("\tboundary=\"" . $this->boundary[3] . '"'); - $body .= $this->LE; - $body .= $this->GetBoundary($this->boundary[3], '', 'text/html', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - $body .= $this->AttachAll("inline", $this->boundary[3]); - $body .= $this->LE; - $body .= $this->EndBoundary($this->boundary[2]); - $body .= $this->LE; - $body .= $this->AttachAll("attachment", $this->boundary[1]); - break; - default: - // catch case 'plain' and case '' - $body .= $this->EncodeString($this->Body, $this->Encoding); - break; - } - - if ($this->IsError()) { - $body = ''; - } elseif ($this->sign_key_file) { - try { - $file = tempnam('', 'mail'); - file_put_contents($file, $body); //TODO check this worked - $signed = tempnam("", "signed"); - if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) { - @unlink($file); - $body = file_get_contents($signed); - @unlink($signed); - } else { - @unlink($file); - @unlink($signed); - throw new phpmailerException($this->Lang("signing").openssl_error_string()); - } - } catch (phpmailerException $e) { - $body = ''; - if ($this->exceptions) { - throw $e; - } - } - } - - return $body; - } - - /** - * Returns the start of a message boundary. - * @access protected - * @param string $boundary - * @param string $charSet - * @param string $contentType - * @param string $encoding - * @return string - */ - protected function GetBoundary($boundary, $charSet, $contentType, $encoding) { - $result = ''; - if($charSet == '') { - $charSet = $this->CharSet; - } - if($contentType == '') { - $contentType = $this->ContentType; - } - if($encoding == '') { - $encoding = $this->Encoding; - } - $result .= $this->TextLine('--' . $boundary); - $result .= sprintf("Content-Type: %s; charset=%s", $contentType, $charSet); - $result .= $this->LE; - $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding); - $result .= $this->LE; - - return $result; - } - - /** - * Returns the end of a message boundary. - * @access protected - * @param string $boundary - * @return string - */ - protected function EndBoundary($boundary) { - return $this->LE . '--' . $boundary . '--' . $this->LE; - } - - /** - * Sets the message type. - * @access protected - * @return void - */ - protected function SetMessageType() { - $this->message_type = array(); - if($this->AlternativeExists()) $this->message_type[] = "alt"; - if($this->InlineImageExists()) $this->message_type[] = "inline"; - if($this->AttachmentExists()) $this->message_type[] = "attach"; - $this->message_type = implode("_", $this->message_type); - if($this->message_type == "") $this->message_type = "plain"; - } - - /** - * Returns a formatted header line. - * @access public - * @param string $name - * @param string $value - * @return string - */ - public function HeaderLine($name, $value) { - return $name . ': ' . $value . $this->LE; - } - - /** - * Returns a formatted mail line. - * @access public - * @param string $value - * @return string - */ - public function TextLine($value) { - return $value . $this->LE; - } - - ///////////////////////////////////////////////// - // CLASS METHODS, ATTACHMENTS - ///////////////////////////////////////////////// - - /** - * Adds an attachment from a path on the filesystem. - * Returns false if the file could not be found - * or accessed. - * @param string $path Path to the attachment. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @throws phpmailerException - * @return bool - */ - public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { - try { - if ( !@is_file($path) ) { - throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE); - } - $filename = basename($path); - if ( $name == '' ) { - $name = $filename; - } - - $this->attachment[] = array( - 0 => $path, - 1 => $filename, - 2 => $name, - 3 => $encoding, - 4 => $type, - 5 => false, // isStringAttachment - 6 => 'attachment', - 7 => 0 - ); - - } catch (phpmailerException $e) { - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - if ($this->SMTPDebug) { - $this->edebug($e->getMessage()."\n"); - } - if ( $e->getCode() == self::STOP_CRITICAL ) { - return false; - } - } - return true; - } - - /** - * Return the current array of attachments - * @return array - */ - public function GetAttachments() { - return $this->attachment; - } - - /** - * Attaches all fs, string, and binary attachments to the message. - * Returns an empty string on failure. - * @access protected - * @param string $disposition_type - * @param string $boundary - * @return string - */ - protected function AttachAll($disposition_type, $boundary) { - // Return text of body - $mime = array(); - $cidUniq = array(); - $incl = array(); - - // Add all attachments - foreach ($this->attachment as $attachment) { - // CHECK IF IT IS A VALID DISPOSITION_FILTER - if($attachment[6] == $disposition_type) { - // Check for string attachment - $string = ''; - $path = ''; - $bString = $attachment[5]; - if ($bString) { - $string = $attachment[0]; - } else { - $path = $attachment[0]; - } - - $inclhash = md5(serialize($attachment)); - if (in_array($inclhash, $incl)) { continue; } - $incl[] = $inclhash; - $filename = $attachment[1]; - $name = $attachment[2]; - $encoding = $attachment[3]; - $type = $attachment[4]; - $disposition = $attachment[6]; - $cid = $attachment[7]; - if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } - $cidUniq[$cid] = true; - - $mime[] = sprintf("--%s%s", $boundary, $this->LE); - $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); - $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); - - if($disposition == 'inline') { - $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); - } - - $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); - - // Encode as string attachment - if($bString) { - $mime[] = $this->EncodeString($string, $encoding); - if($this->IsError()) { - return ''; - } - $mime[] = $this->LE.$this->LE; - } else { - $mime[] = $this->EncodeFile($path, $encoding); - if($this->IsError()) { - return ''; - } - $mime[] = $this->LE.$this->LE; - } - } - } - - $mime[] = sprintf("--%s--%s", $boundary, $this->LE); - - return implode("", $mime); - } - - /** - * Encodes attachment in requested format. - * Returns an empty string on failure. - * @param string $path The full path to the file - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @throws phpmailerException - * @see EncodeFile() - * @access protected - * @return string - */ - protected function EncodeFile($path, $encoding = 'base64') { - try { - if (!is_readable($path)) { - throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); - } - // if (!function_exists('get_magic_quotes')) { - // function get_magic_quotes() { - // return false; - // } - // } - $magic_quotes = get_magic_quotes_runtime(); - if ($magic_quotes) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) { - set_magic_quotes_runtime(0); - } else { - ini_set('magic_quotes_runtime', 0); - } - } - $file_buffer = file_get_contents($path); - $file_buffer = $this->EncodeString($file_buffer, $encoding); - if ($magic_quotes) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) { - set_magic_quotes_runtime($magic_quotes); - } else { - ini_set('magic_quotes_runtime', $magic_quotes); - } - } - return $file_buffer; - } catch (Exception $e) { - $this->SetError($e->getMessage()); - return ''; - } - } - - /** - * Encodes string to requested format. - * Returns an empty string on failure. - * @param string $str The text to encode - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @access public - * @return string - */ - public function EncodeString($str, $encoding = 'base64') { - $encoded = ''; - switch(strtolower($encoding)) { - case 'base64': - $encoded = chunk_split(base64_encode($str), 76, $this->LE); - break; - case '7bit': - case '8bit': - $encoded = $this->FixEOL($str); - //Make sure it ends with a line break - if (substr($encoded, -(strlen($this->LE))) != $this->LE) - $encoded .= $this->LE; - break; - case 'binary': - $encoded = $str; - break; - case 'quoted-printable': - $encoded = $this->EncodeQP($str); - break; - default: - $this->SetError($this->Lang('encoding') . $encoding); - break; - } - return $encoded; - } - - /** - * Encode a header string to best (shortest) of Q, B, quoted or none. - * @access public - * @param string $str - * @param string $position - * @return string - */ - public function EncodeHeader($str, $position = 'text') { - $x = 0; - - switch (strtolower($position)) { - case 'phrase': - if (!preg_match('/[\200-\377]/', $str)) { - // Can't use addslashes as we don't know what value has magic_quotes_sybase - $encoded = addcslashes($str, "\0..\37\177\\\""); - if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { - return ($encoded); - } else { - return ("\"$encoded\""); - } - } - $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); - break; - case 'comment': - $x = preg_match_all('/[()"]/', $str, $matches); - // Fall-through - case 'text': - default: - $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); - break; - } - - if ($x == 0) { - return ($str); - } - - $maxlen = 75 - 7 - strlen($this->CharSet); - // Try to select the encoding which should produce the shortest output - if (strlen($str)/3 < $x) { - $encoding = 'B'; - if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) { - // Use a custom function which correctly encodes and wraps long - // multibyte strings without breaking lines within a character - $encoded = $this->Base64EncodeWrapMB($str, "\n"); - } else { - $encoded = base64_encode($str); - $maxlen -= $maxlen % 4; - $encoded = trim(chunk_split($encoded, $maxlen, "\n")); - } - } else { - $encoding = 'Q'; - $encoded = $this->EncodeQ($str, $position); - $encoded = $this->WrapText($encoded, $maxlen, true); - $encoded = str_replace('='.self::CRLF, "\n", trim($encoded)); - } - - $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded); - $encoded = trim(str_replace("\n", $this->LE, $encoded)); - - return $encoded; - } - - /** - * Checks if a string contains multibyte characters. - * @access public - * @param string $str multi-byte text to wrap encode - * @return bool - */ - public function HasMultiBytes($str) { - if (function_exists('mb_strlen')) { - return (strlen($str) > mb_strlen($str, $this->CharSet)); - } else { // Assume no multibytes (we can't handle without mbstring functions anyway) - return false; - } - } - - /** - * Correctly encodes and wraps long multibyte strings for mail headers - * without breaking lines within a character. - * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php - * @access public - * @param string $str multi-byte text to wrap encode - * @param string $lf string to use as linefeed/end-of-line - * @return string - */ - public function Base64EncodeWrapMB($str, $lf=null) { - $start = "=?".$this->CharSet."?B?"; - $end = "?="; - $encoded = ""; - if ($lf === null) { - $lf = $this->LE; - } - - $mb_length = mb_strlen($str, $this->CharSet); - // Each line must have length <= 75, including $start and $end - $length = 75 - strlen($start) - strlen($end); - // Average multi-byte ratio - $ratio = $mb_length / strlen($str); - // Base64 has a 4:3 ratio - $offset = $avgLength = floor($length * $ratio * .75); - - for ($i = 0; $i < $mb_length; $i += $offset) { - $lookBack = 0; - - do { - $offset = $avgLength - $lookBack; - $chunk = mb_substr($str, $i, $offset, $this->CharSet); - $chunk = base64_encode($chunk); - $lookBack++; - } - while (strlen($chunk) > $length); - - $encoded .= $chunk . $lf; - } - - // Chomp the last linefeed - $encoded = substr($encoded, 0, -strlen($lf)); - return $encoded; - } - - /** - * Encode string to quoted-printable. - * Only uses standard PHP, slow, but will always work - * @access public - * @param string $input - * @param integer $line_max Number of chars allowed on a line before wrapping - * @param bool $space_conv - * @internal param string $string the text to encode - * @return string - */ - public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) { - $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); - $lines = preg_split('/(?:\r\n|\r|\n)/', $input); - $eol = "\r\n"; - $escape = '='; - $output = ''; - while( list(, $line) = each($lines) ) { - $linlen = strlen($line); - $newline = ''; - for($i = 0; $i < $linlen; $i++) { - $c = substr( $line, $i, 1 ); - $dec = ord( $c ); - if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E - $c = '=2E'; - } - if ( $dec == 32 ) { - if ( $i == ( $linlen - 1 ) ) { // convert space at eol only - $c = '=20'; - } else if ( $space_conv ) { - $c = '=20'; - } - } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required - $h2 = (integer)floor($dec/16); - $h1 = (integer)floor($dec%16); - $c = $escape.$hex[$h2].$hex[$h1]; - } - if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted - $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay - $newline = ''; - // check if newline first character will be point or not - if ( $dec == 46 ) { - $c = '=2E'; - } - } - $newline .= $c; - } // end of for - $output .= $newline.$eol; - } // end of while - return $output; - } - - /** - * Encode string to RFC2045 (6.7) quoted-printable format - * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version - * Also results in same content as you started with after decoding - * @see EncodeQPphp() - * @access public - * @param string $string the text to encode - * @param integer $line_max Number of chars allowed on a line before wrapping - * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function - * @return string - * @author Marcus Bointon - */ - public function EncodeQP($string, $line_max = 76, $space_conv = false) { - if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) - return quoted_printable_encode($string); - } - $filters = stream_get_filters(); - if (!in_array('convert.*', $filters)) { //Got convert stream filter? - return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation - } - $fp = fopen('php://temp/', 'r+'); - $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks - $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE); - $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params); - fputs($fp, $string); - rewind($fp); - $out = stream_get_contents($fp); - stream_filter_remove($s); - $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange - fclose($fp); - return $out; - } - - /** - * Encode string to q encoding. - * @link http://tools.ietf.org/html/rfc2047 - * @param string $str the text to encode - * @param string $position Where the text is going to be used, see the RFC for what that means - * @access public - * @return string - */ - public function EncodeQ($str, $position = 'text') { - //There should not be any EOL in the string - $pattern=""; - $encoded = str_replace(array("\r", "\n"), '', $str); - switch (strtolower($position)) { - case 'phrase': - $pattern = '^A-Za-z0-9!*+\/ -'; - break; - - case 'comment': - $pattern = '\(\)"'; - //note that we dont break here! - //for this reason we build the $pattern withoud including delimiters and [] - - case 'text': - default: - //Replace every high ascii, control =, ? and _ characters - //We put \075 (=) as first value to make sure it's the first one in being converted, preventing double encode - $pattern = '\075\000-\011\013\014\016-\037\077\137\177-\377' . $pattern; - break; - } - - if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) { - foreach (array_unique($matches[0]) as $char) { - $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded); - } - } - - //Replace every spaces to _ (more readable than =20) - return str_replace(' ', '_', $encoded); -} - - - /** - * Adds a string or binary attachment (non-filesystem) to the list. - * This method can be used to attach ascii or binary data, - * such as a BLOB record from a database. - * @param string $string String attachment data. - * @param string $filename Name of the attachment. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return void - */ - public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') { - // Append to $attachment array - $this->attachment[] = array( - 0 => $string, - 1 => $filename, - 2 => basename($filename), - 3 => $encoding, - 4 => $type, - 5 => true, // isStringAttachment - 6 => 'attachment', - 7 => 0 - ); - } - - /** - * Adds an embedded attachment. This can include images, sounds, and - * just about any other document. Make sure to set the $type to an - * image type. For JPEG images use "image/jpeg" and for GIF images - * use "image/gif". - * @param string $path Path to the attachment. - * @param string $cid Content ID of the attachment. Use this to identify - * the Id for accessing the image in an HTML form. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return bool - */ - public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { - - if ( !@is_file($path) ) { - $this->SetError($this->Lang('file_access') . $path); - return false; - } - - $filename = basename($path); - if ( $name == '' ) { - $name = $filename; - } - - // Append to $attachment array - $this->attachment[] = array( - 0 => $path, - 1 => $filename, - 2 => $name, - 3 => $encoding, - 4 => $type, - 5 => false, // isStringAttachment - 6 => 'inline', - 7 => $cid - ); - - return true; - } - - /** - * Adds an embedded stringified attachment. This can include images, sounds, and - * just about any other document. Make sure to set the $type to an - * image type. For JPEG images use "image/jpeg" and for GIF images - * use "image/gif". - * @param string $string The attachment. - * @param string $cid Content ID of the attachment. Use this to identify - * the Id for accessing the image in an HTML form. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return bool - */ - public function AddStringEmbeddedImage($string, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { - // Append to $attachment array - $this->attachment[] = array( - 0 => $string, - 1 => $name, - 2 => $name, - 3 => $encoding, - 4 => $type, - 5 => true, // isStringAttachment - 6 => 'inline', - 7 => $cid - ); - } - - /** - * Returns true if an inline attachment is present. - * @access public - * @return bool - */ - public function InlineImageExists() { - foreach($this->attachment as $attachment) { - if ($attachment[6] == 'inline') { - return true; - } - } - return false; - } - - /** - * Returns true if an attachment (non-inline) is present. - * @return bool - */ - public function AttachmentExists() { - foreach($this->attachment as $attachment) { - if ($attachment[6] == 'attachment') { - return true; - } - } - return false; - } - - /** - * Does this message have an alternative body set? - * @return bool - */ - public function AlternativeExists() { - return !empty($this->AltBody); - } - - ///////////////////////////////////////////////// - // CLASS METHODS, MESSAGE RESET - ///////////////////////////////////////////////// - - /** - * Clears all recipients assigned in the TO array. Returns void. - * @return void - */ - public function ClearAddresses() { - foreach($this->to as $to) { - unset($this->all_recipients[strtolower($to[0])]); - } - $this->to = array(); - } - - /** - * Clears all recipients assigned in the CC array. Returns void. - * @return void - */ - public function ClearCCs() { - foreach($this->cc as $cc) { - unset($this->all_recipients[strtolower($cc[0])]); - } - $this->cc = array(); - } - - /** - * Clears all recipients assigned in the BCC array. Returns void. - * @return void - */ - public function ClearBCCs() { - foreach($this->bcc as $bcc) { - unset($this->all_recipients[strtolower($bcc[0])]); - } - $this->bcc = array(); - } - - /** - * Clears all recipients assigned in the ReplyTo array. Returns void. - * @return void - */ - public function ClearReplyTos() { - $this->ReplyTo = array(); - } - - /** - * Clears all recipients assigned in the TO, CC and BCC - * array. Returns void. - * @return void - */ - public function ClearAllRecipients() { - $this->to = array(); - $this->cc = array(); - $this->bcc = array(); - $this->all_recipients = array(); - } - - /** - * Clears all previously set filesystem, string, and binary - * attachments. Returns void. - * @return void - */ - public function ClearAttachments() { - $this->attachment = array(); - } - - /** - * Clears all custom headers. Returns void. - * @return void - */ - public function ClearCustomHeaders() { - $this->CustomHeader = array(); - } - - ///////////////////////////////////////////////// - // CLASS METHODS, MISCELLANEOUS - ///////////////////////////////////////////////// - - /** - * Adds the error message to the error container. - * @access protected - * @param string $msg - * @return void - */ - protected function SetError($msg) { - $this->error_count++; - if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { - $lasterror = $this->smtp->getError(); - if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { - $msg .= '

'; $s .= '
'; - $s .= ''; - $s .= ''; + $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; + 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 .= ''; + $s .= '"; + $s .= '
'; + } $s .= '
'; $s .= ''; @@ -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) { From 21605a52c975074df20710b23d72e553e067217a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 15 Jan 2017 12:23:40 +0000 Subject: [PATCH 43/58] Some speed improvements --- gpluspost/gpluspost.php | 2 +- jappixmini/jappixmini.php | 3 ++- pumpio/pumpio.php | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php index 43a1635e3..a3ed1f9cd 100644 --- 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); } diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 08d821128..44b69a4e5 100644 --- 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; diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 1b3c587f9..69dd5d314 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -864,6 +864,11 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = true) { require_once('include/items.php'); + if ($post->object->id == "") { + logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG); + return; + } + // Searching for the liked post // Two queries for speed issues $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1", @@ -899,8 +904,8 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru $post->actor->url = $self[0]['url']; $post->actor->image->url = $self[0]['photo']; } else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); From fd0ef2f2c7ccaae0a25d1c8b59a694116acfa2af Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 17 Jan 2017 19:01:27 +0000 Subject: [PATCH 44/58] Pumpio: Optimised query --- pumpio/pumpio.php | 69 +++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 48 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 69dd5d314..65f555525 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -835,8 +835,8 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { if(link_compare($post->actor->url, $own_id)) { $contactid = $self[0]['id']; } else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); @@ -960,52 +960,24 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru function pumpio_get_contact($uid, $contact, $no_insert = false) { - if (function_exists("update_gcontact")) { - update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, - "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, - "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, - "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id))); - - $cid = get_contact($contact->url, $uid); - } else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link($contact->url))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link($contact->url)), - dbesc($contact->displayName), - dbesc($contact->preferredUsername), - dbesc($contact->image->url)); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->displayName), - dbesc($contact->preferredUsername), - dbesc($contact->image->url), - dbesc(normalise_link($contact->url))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location->displayName), - dbesc($contact->summary), - dbesc(normalise_link($contact->url))); - - $cid = 0; - } + update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2, + "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, + "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, + "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id))); + $cid = get_contact($contact->url, $uid); if ($no_insert) return($cid); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", - intval($uid), dbesc($contact->url)); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", + intval($uid), dbesc(normalise_link($contact->url))); - if(!count($r)) { + if (!count($r)) { // create contact record - q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + 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 ) ", + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)", intval($uid), dbesc(datetime_convert()), dbesc($contact->url), @@ -1023,15 +995,16 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { intval(1) ); - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", - dbesc($contact->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", + dbesc(normalise_link($contact->url)), intval($uid) ); - if(! count($r)) + if (!count($r)) { return(false); + } - $contact_id = $r[0]['id']; + $contact_id = $r[0]['id']; $g = q("select def_gid from user where uid = %d limit 1", intval($uid) @@ -1168,16 +1141,16 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $post->actor->image->url = $self[0]['photo']; } elseif ($contact_id == 0) { // Take an existing contact, the contact of the note or - as a fallback - the id of the user - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); if(count($r)) $contact_id = $r[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($post->actor->url), + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc(normalise_link($post->actor->url)), intval($uid) ); From b5701ac885d3f5d93c5d593783f8d7158be7e043 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 18 Jan 2017 14:04:53 +0100 Subject: [PATCH 45/58] Update IT strings --- appnet/lang/it/messages.po | 2 +- blackout/lang/it/messages.po | 2 +- blockem/lang/it/messages.po | 2 +- blogger/lang/it/messages.po | 2 +- buffer/lang/it/messages.po | 4 +- buglink/lang/it/messages.po | 2 +- cal/lang/it/messages.po | 2 +- communityhome/lang/it/messages.po | 2 +- curweather/lang/it/strings.php | 4 +- diaspora/lang/it/messages.po | 2 +- dwpost/lang/it/messages.po | 2 +- editplain/lang/it/messages.po | 2 +- forumdirectory/lang/it/messages.po | 2 +- fromgplus/lang/it/messages.po | 10 ++-- fromgplus/lang/it/strings.php | 4 +- gpluspost/lang/it/messages.po | 28 ++++----- ijpost/lang/it/messages.po | 10 ++-- ijpost/lang/it/strings.php | 4 +- .../lang/it/messages.po | 2 +- js_upload/lang/it/messages.po | 2 +- langfilter/lang/it/messages.po | 2 +- mailstream/lang/it/messages.po | 2 +- newmemberwidget/lang/it/messages.po | 2 +- notifyall/lang/it/messages.po | 57 +++++++++++++++++++ notifyall/lang/it/strings.php | 16 ++++++ public_server/lang/it/messages.po | 2 +- pumpio/lang/it/messages.po | 6 +- rendertime/lang/it/messages.po | 6 +- smileybutton/lang/it/messages.po | 2 +- tictac/lang/it/messages.po | 4 +- webrtc/lang/it/messages.po | 2 +- windowsphonepush/lang/it/messages.po | 2 +- wppost/lang/it/messages.po | 40 ++++++------- wppost/lang/it/strings.php | 5 +- 34 files changed, 153 insertions(+), 85 deletions(-) create mode 100644 notifyall/lang/it/messages.po create mode 100644 notifyall/lang/it/strings.php diff --git a/appnet/lang/it/messages.po b/appnet/lang/it/messages.po index 61ad1b723..17b933fe4 100644 --- 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 \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" diff --git a/blackout/lang/it/messages.po b/blackout/lang/it/messages.po index 65ab3bc62..b9b5ec308 100644 --- 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 \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" diff --git a/blockem/lang/it/messages.po b/blockem/lang/it/messages.po index 7c2ab70ae..5e619da5b 100644 --- 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 \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" diff --git a/blogger/lang/it/messages.po b/blogger/lang/it/messages.po index edb3d545e..6babcabf4 100644 --- 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 \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" diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po index 05f973dea..232cd2d61 100644 --- a/buffer/lang/it/messages.po +++ b/buffer/lang/it/messages.po @@ -5,14 +5,14 @@ # # Translators: # fabrixxm , 2014 -# Sandro Santilli , 2015 +# Sandro Santilli , 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 \n" +"Last-Translator: Sandro Santilli \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" diff --git a/buglink/lang/it/messages.po b/buglink/lang/it/messages.po index 5d5bf5ec9..63e643ea9 100644 --- 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 \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" diff --git a/cal/lang/it/messages.po b/cal/lang/it/messages.po index 0e0c1119f..f2aa1cbb5 100644 --- 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 \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" diff --git a/communityhome/lang/it/messages.po b/communityhome/lang/it/messages.po index b42bba91a..639615130 100644 --- 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 \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" diff --git a/curweather/lang/it/strings.php b/curweather/lang/it/strings.php index 05319ab44..99525cc1e 100644 --- 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. Berlin,DE or 14476,DE."] = "Identificatore della tua posizione (nome o CAP), p.e. Roma, IT or 00186,IT."; $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 °C or °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"; diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po index f10e7436e..514dcbb1f 100644 --- 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 \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" diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po index a3bc0fdb7..dbd210168 100644 --- 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 \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" diff --git a/editplain/lang/it/messages.po b/editplain/lang/it/messages.po index c431ba906..6b931176c 100644 --- 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 \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" diff --git a/forumdirectory/lang/it/messages.po b/forumdirectory/lang/it/messages.po index 36134adba..ca53442c3 100644 --- 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 \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" diff --git a/fromgplus/lang/it/messages.po b/fromgplus/lang/it/messages.po index c522dea46..d47e5cb64 100644 --- a/fromgplus/lang/it/messages.po +++ b/fromgplus/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2017 # Tobias Diekershoff , 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-22 06:48+0000\n" -"Last-Translator: Tobias Diekershoff \n" +"PO-Revision-Date: 2017-01-18 10:38+0000\n" +"Last-Translator: fabrixxm \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" @@ -34,7 +34,7 @@ msgstr "ID Google Account" #: fromgplus.php:61 msgid "Add keywords to post" -msgstr "" +msgstr "Aggiungi parole chiave ai post" #: fromgplus.php:66 fromgplus.php:95 msgid "Save Settings" @@ -46,7 +46,7 @@ msgstr "Impostazioni Importa Google+ salvate" #: fromgplus.php:96 msgid "Key" -msgstr "" +msgstr "Chiave" #: fromgplus.php:103 msgid "Settings updated." diff --git a/fromgplus/lang/it/strings.php b/fromgplus/lang/it/strings.php index f66250f93..0e866fc89 100644 --- a/fromgplus/lang/it/strings.php +++ b/fromgplus/lang/it/strings.php @@ -8,8 +8,8 @@ function string_plural_select_it($n){ $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["Add keywords to post"] = ""; +$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"] = ""; +$a->strings["Key"] = "Chiave"; $a->strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/gpluspost/lang/it/messages.po b/gpluspost/lang/it/messages.po index 5ddaf97c4..e6d636b45 100644 --- 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 \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." diff --git a/ijpost/lang/it/messages.po b/ijpost/lang/it/messages.po index 43e00fb35..aba068467 100644 --- a/ijpost/lang/it/messages.po +++ b/ijpost/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 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 \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" diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php index c0328aa06..73e8bed46 100644 --- 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"; diff --git a/infiniteimprobabilitydrive/lang/it/messages.po b/infiniteimprobabilitydrive/lang/it/messages.po index 75d30d324..2b68b0123 100644 --- 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 \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" diff --git a/js_upload/lang/it/messages.po b/js_upload/lang/it/messages.po index 1ef59b982..5d8fe6875 100644 --- 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 \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" diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po index 81cca5dd4..6eded71fa 100644 --- a/langfilter/lang/it/messages.po +++ b/langfilter/lang/it/messages.po @@ -5,7 +5,7 @@ # # Translators: # fabrixxm , 2015 -# Sandro Santilli , 2015 +# Sandro Santilli , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" diff --git a/mailstream/lang/it/messages.po b/mailstream/lang/it/messages.po index 77e9d09b8..6ee63621c 100644 --- a/mailstream/lang/it/messages.po +++ b/mailstream/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 13:02+0000\n" "Last-Translator: fabrixxm \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" diff --git a/newmemberwidget/lang/it/messages.po b/newmemberwidget/lang/it/messages.po index 9c42f60a1..f0a8c14f7 100644 --- a/newmemberwidget/lang/it/messages.po +++ b/newmemberwidget/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-01 14:12+0200\n" "PO-Revision-Date: 2014-09-10 14:12+0000\n" "Last-Translator: fabrixxm \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" diff --git a/notifyall/lang/it/messages.po b/notifyall/lang/it/messages.po new file mode 100644 index 000000000..e56126b74 --- /dev/null +++ b/notifyall/lang/it/messages.po @@ -0,0 +1,57 @@ +# ADDON notifyall +# Copyright (C) +# This file is distributed under the same license as the Friendica notifyall addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-14 16:41+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: fabrixxm , 2017\n" +"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/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" + +#: notifyall.php:26 +msgid "Send email to all members" +msgstr "Invia email a tutti i membri" + +#: notifyall.php:42 +#, php-format +msgid "%s Administrator" +msgstr "Amministratore %s" + +#: notifyall.php:44 +#, php-format +msgid "%1$s, %2$s Administrator" +msgstr "%1$s, amministratore di %2$s" + +#: notifyall.php:60 +msgid "No recipients found." +msgstr "Nessun destinatario trovato." + +#: notifyall.php:78 +msgid "Emails sent" +msgstr "Email inviate" + +#: notifyall.php:86 +msgid "Send email to all members of this Friendica instance." +msgstr "Invia email a tutti i membri di questa istanza Friendica." + +#: notifyall.php:91 +msgid "Message subject" +msgstr "Oggetto del messaggio" + +#: notifyall.php:92 +msgid "Test mode (only send to administrator)" +msgstr "Modalità test (invia solo agli amministratori)" + +#: notifyall.php:93 +msgid "Submit" +msgstr "Invia" diff --git a/notifyall/lang/it/strings.php b/notifyall/lang/it/strings.php new file mode 100644 index 000000000..c47067b6b --- /dev/null +++ b/notifyall/lang/it/strings.php @@ -0,0 +1,16 @@ +strings["Send email to all members"] = "Invia email a tutti i membri"; +$a->strings["%s Administrator"] = "Amministratore %s"; +$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, amministratore di %2\$s"; +$a->strings["No recipients found."] = "Nessun destinatario trovato."; +$a->strings["Emails sent"] = "Email inviate"; +$a->strings["Send email to all members of this Friendica instance."] = "Invia email a tutti i membri di questa istanza Friendica."; +$a->strings["Message subject"] = "Oggetto del messaggio"; +$a->strings["Test mode (only send to administrator)"] = "Modalità test (invia solo agli amministratori)"; +$a->strings["Submit"] = "Invia"; diff --git a/public_server/lang/it/messages.po b/public_server/lang/it/messages.po index 612033441..079d46bf5 100644 --- a/public_server/lang/it/messages.po +++ b/public_server/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-10-15 09:02+0000\n" "Last-Translator: fabrixxm \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" diff --git a/pumpio/lang/it/messages.po b/pumpio/lang/it/messages.po index c40b63ca4..3529a0808 100644 --- a/pumpio/lang/it/messages.po +++ b/pumpio/lang/it/messages.po @@ -9,10 +9,10 @@ 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: 2014-09-10 14:24+0000\n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2015-11-01 11:05+0000\n" "Last-Translator: fabrixxm \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" diff --git a/rendertime/lang/it/messages.po b/rendertime/lang/it/messages.po index a77f64e16..6c5c5dcea 100644 --- a/rendertime/lang/it/messages.po +++ b/rendertime/lang/it/messages.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-09-10 14:32+0000\n" "Last-Translator: fabrixxm \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" -#: rendertime.php:30 +#: rendertime.php:29 #, php-format msgid "" "Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, " diff --git a/smileybutton/lang/it/messages.po b/smileybutton/lang/it/messages.po index 47060c79e..e3bbf4fea 100644 --- a/smileybutton/lang/it/messages.po +++ b/smileybutton/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 14:33+0000\n" "Last-Translator: fabrixxm \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" diff --git a/tictac/lang/it/messages.po b/tictac/lang/it/messages.po index 3cba14d6e..4e365574f 100644 --- a/tictac/lang/it/messages.po +++ b/tictac/lang/it/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-09-10 14:43+0000\n" "Last-Translator: fabrixxm \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" diff --git a/webrtc/lang/it/messages.po b/webrtc/lang/it/messages.po index ef48852e7..ae800a32d 100644 --- a/webrtc/lang/it/messages.po +++ b/webrtc/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 14:50+0000\n" "Last-Translator: fabrixxm \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" diff --git a/windowsphonepush/lang/it/messages.po b/windowsphonepush/lang/it/messages.po index c499d6f5b..be085107f 100644 --- a/windowsphonepush/lang/it/messages.po +++ b/windowsphonepush/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-10-26 15:02+0100\n" "PO-Revision-Date: 2014-10-31 13:46+0000\n" "Last-Translator: fabrixxm \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" diff --git a/wppost/lang/it/messages.po b/wppost/lang/it/messages.po index c489959b4..c6b7ee18b 100644 --- a/wppost/lang/it/messages.po +++ b/wppost/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014-2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" -"PO-Revision-Date: 2014-09-10 14:51+0000\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2015-08-31 10:30+0000\n" "Last-Translator: fabrixxm \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" @@ -23,46 +23,42 @@ msgstr "" msgid "Post to Wordpress" msgstr "Invia a Wordpress" -#: wppost.php:79 wppost.php:83 -msgid "Wordpress Export" -msgstr "Esporta Wordpress" +#: wppost.php:76 +msgid "WordPress Post Settings" +msgstr "Impostazioni invio a WordPress" -#: wppost.php:86 +#: wppost.php:78 msgid "Enable WordPress Post Plugin" msgstr "Abilita il plugin di invio a Wordpress" -#: wppost.php:91 +#: wppost.php:83 msgid "WordPress username" msgstr "Nome utente Wordpress" -#: wppost.php:96 +#: wppost.php:88 msgid "WordPress password" msgstr "Password Wordpress" -#: wppost.php:101 +#: wppost.php:93 msgid "WordPress API URL" msgstr "Indirizzo API Wordpress" -#: wppost.php:106 +#: wppost.php:98 msgid "Post to WordPress by default" msgstr "Invia sempre a Wordpress" -#: wppost.php:111 +#: wppost.php:103 msgid "Provide a backlink to the Friendica post" msgstr "Inserisci un link al messaggio originale su Friendica" -#: wppost.php:116 -msgid "Don't post messages that are too short" -msgstr "Non inviare messaggi troppo corti" +#: wppost.php:110 +msgid "Submit" +msgstr "Invia" -#: wppost.php:122 -msgid "Save Settings" -msgstr "Salva Impostazioni" - -#: wppost.php:243 +#: wppost.php:201 msgid "Post from Friendica" msgstr "Messaggio da Friendica" -#: wppost.php:255 +#: wppost.php:207 msgid "Read the original post and comment stream on Friendica" msgstr "Leggi il messaggio originale e i commenti su Friendica" diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php index 855d55d2d..0d6b184ec 100644 --- a/wppost/lang/it/strings.php +++ b/wppost/lang/it/strings.php @@ -6,14 +6,13 @@ function string_plural_select_it($n){ }} ; $a->strings["Post to Wordpress"] = "Invia a Wordpress"; -$a->strings["Wordpress Export"] = "Esporta Wordpress"; +$a->strings["WordPress Post Settings"] = "Impostazioni invio a WordPress"; $a->strings["Enable WordPress Post Plugin"] = "Abilita il plugin di invio a Wordpress"; $a->strings["WordPress username"] = "Nome utente Wordpress"; $a->strings["WordPress password"] = "Password Wordpress"; $a->strings["WordPress API URL"] = "Indirizzo API Wordpress"; $a->strings["Post to WordPress by default"] = "Invia sempre a Wordpress"; $a->strings["Provide a backlink to the Friendica post"] = "Inserisci un link al messaggio originale su Friendica"; -$a->strings["Don't post messages that are too short"] = "Non inviare messaggi troppo corti"; -$a->strings["Save Settings"] = "Salva Impostazioni"; +$a->strings["Submit"] = "Invia"; $a->strings["Post from Friendica"] = "Messaggio da Friendica"; $a->strings["Read the original post and comment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica"; From e87202e42f5057924c9f33955ca7a4ca34ad1fa7 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 18 Jan 2017 14:05:20 +0100 Subject: [PATCH 46/58] transifex-client config --- .tx/config | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..50b8ef45b --- /dev/null +++ b/.tx/config @@ -0,0 +1,392 @@ +[main] +host = https://www.transifex.com + +[friendica.addon_appnet_messagespo] +file_filter = appnet/lang//messages.po +source_file = appnet/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_blackout_messagespo] +file_filter = blackout/lang//messages.po +source_file = blackout/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_blockem_messagespo] +file_filter = blockem/lang//messages.po +source_file = blockem/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_blogger_messagespo] +file_filter = blogger/lang//messages.po +source_file = blogger/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_buffer_messagespo] +file_filter = buffer/lang//messages.po +source_file = buffer/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_buglink_messagespo] +file_filter = buglink/lang//messages.po +source_file = buglink/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_cal_messagespo] +file_filter = cal/lang//messages.po +source_file = cal/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_communityhome_messagespo] +file_filter = communityhome/lang//messages.po +source_file = communityhome/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_curweather_messagespo] +file_filter = curweather/lang//messages.po +source_file = curweather/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_dav_messagespo] +file_filter = dav/lang//messages.po +source_file = dav/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_diaspora_messagespo] +file_filter = diaspora/lang//messages.po +source_file = diaspora/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_dwpost_messagespo] +file_filter = dwpost/lang//messages.po +source_file = dwpost/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_editplain_messagespo] +file_filter = editplain/lang//messages.po +source_file = editplain/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_forumdirectory_messagespo] +file_filter = forumdirectory/lang//messages.po +source_file = forumdirectory/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_forumlist_messagespo] +file_filter = forumlist/lang//messages.po +source_file = forumlist/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_fromapp_messagespo] +file_filter = fromapp/lang//messages.po +source_file = fromapp/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_fromgplus_messagespo] +file_filter = fromgplus/lang//messages.po +source_file = fromgplus/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_geonames_messagespo] +file_filter = geonames/lang//messages.po +source_file = geonames/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_gnot_messagespo] +file_filter = gnot/lang//messages.po +source_file = gnot/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_gpluspost_messagespo] +file_filter = gpluspost/lang//messages.po +source_file = gpluspost/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_gravatar_messagespo] +file_filter = gravatar/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//messages.po +source_file = group_text/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_ijpost_messagespo] +file_filter = ijpost/lang//messages.po +source_file = ijpost/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_impressum_messagespo] +file_filter = impressum/lang//messages.po +source_file = impressum/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_infiniteimprobabilitydrive_messagespo] +file_filter = infiniteimprobabilitydrive/lang//messages.po +source_file = infiniteimprobabilitydrive/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_irc_messagespo] +file_filter = irc/lang//messages.po +source_file = irc/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_jappixmini_messagespo] +file_filter = jappixmini/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//messages.po +source_file = js_upload/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_krynn_messagespo] +file_filter = krynn/lang//messages.po +source_file = krynn/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_langfilter_messagespo] +file_filter = langfilter/lang//messages.po +source_file = langfilter/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_libertree_messagespo] +file_filter = libertree/lang//messages.po +source_file = libertree/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_libravatar_messagespo] +file_filter = libravatar/lang//messages.po +source_file = libravatar/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_ljpost_messagespo] +file_filter = ljpost/lang//messages.po +source_file = ljpost/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_mailstream_messagespo] +file_filter = mailstream/lang//messages.po +source_file = mailstream/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_morepokes_messagespo] +file_filter = morepokes/lang//messages.po +source_file = morepokes/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_newmemberwidget_messagespo] +file_filter = newmemberwidget/lang//messages.po +source_file = newmemberwidget/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_notifyall_messagespo] +file_filter = notifyall/lang//messages.po +source_file = notifyall/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_notimeline_messagespo] +file_filter = notimeline/lang//messages.po +source_file = notimeline/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_nsfw_messagespo] +file_filter = nsfw/lang//messages.po +source_file = nsfw/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_numfriends_messagespo] +file_filter = numfriends/lang//messages.po +source_file = numfriends/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_openstreetmap_messagespo] +file_filter = openstreetmap/lang//messages.po +source_file = openstreetmap/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_pageheader_messagespo] +file_filter = pageheader/lang//messages.po +source_file = pageheader/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_piwik_messagespo] +file_filter = piwik/lang//messages.po +source_file = piwik/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_planets_messagespo] +file_filter = planets/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//messages.po +source_file = public_server/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_pumpio_messagespo] +file_filter = pumpio/lang//messages.po +source_file = pumpio/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_qcomment_messagespo] +file_filter = qcomment/lang//messages.po +source_file = qcomment/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_randplace_messagespo] +file_filter = randplace/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//messages.po +source_file = remote_permissions/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_rendertime_messagespo] +file_filter = rendertime/lang//messages.po +source_file = rendertime/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_showmore_messagespo] +file_filter = showmore/lang//messages.po +source_file = showmore/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_smileybutton_messagespo] +file_filter = smileybutton/lang//messages.po +source_file = smileybutton/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_snautofollow_messagespo] +file_filter = snautofollow/lang//messages.po +source_file = snautofollow/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_startpage_messagespo] +file_filter = startpage/lang//messages.po +source_file = startpage/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_statusnet_messagespo] +file_filter = statusnet/lang//messages.po +source_file = statusnet/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_superblock_messagespo] +file_filter = superblock/lang//messages.po +source_file = superblock/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_testdrive_messagespo] +file_filter = testdrive/lang//messages.po +source_file = testdrive/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_tictac_messagespo] +file_filter = tictac/lang//messages.po +source_file = tictac/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_tumblr_messagespo] +file_filter = tumblr/lang//messages.po +source_file = tumblr/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_twitter_messagespo] +file_filter = twitter/lang//messages.po +source_file = twitter/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_uhremotestorage_messagespo] +file_filter = uhremotestorage/lang//messages.po +source_file = uhremotestorage/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_webrtc_messagespo] +file_filter = webrtc/lang//messages.po +source_file = webrtc/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_windowsphonepush_messagespo] +file_filter = windowsphonepush/lang//messages.po +source_file = windowsphonepush/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_wppost_messagespo] +file_filter = wppost/lang//messages.po +source_file = wppost/lang/C/messages.po +source_lang = en +type = PO + +[friendica.addon_yourls_messagespo] +file_filter = yourls/lang//messages.po +source_file = yourls/lang/C/messages.po +source_lang = en +type = PO From edb7784fd581644df349df6970fe4b33f7804e00 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 24 Jan 2017 15:49:24 +0100 Subject: [PATCH 47/58] WP Post update German translation --- wppost/lang/de/messages.po | 9 +++++---- wppost/lang/de/strings.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po index 973c4407c..b762ab39c 100644 --- a/wppost/lang/de/messages.po +++ b/wppost/lang/de/messages.po @@ -4,14 +4,15 @@ # # # Translators: -# bavatar , 2014-2015 +# Tobias Diekershoff , 2014-2015 +# Tobias Diekershoff , 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: 2015-07-28 17:31+0000\n" -"Last-Translator: bavatar \n" +"PO-Revision-Date: 2017-01-24 13:39+0000\n" +"Last-Translator: Tobias Diekershoff \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" @@ -49,7 +50,7 @@ msgstr "Standardmäßig auf WordPress veröffentlichen" #: wppost.php:103 msgid "Provide a backlink to the Friendica post" -msgstr "Einen zurück zum Friendica-Beitrag hinzufügen" +msgstr "Einen Link zurück zum Friendica-Beitrag hinzufügen" #: wppost.php:110 msgid "Submit" diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php index 48c1688e4..a00bf0516 100644 --- a/wppost/lang/de/strings.php +++ b/wppost/lang/de/strings.php @@ -12,7 +12,7 @@ $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; -$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen"; +$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; $a->strings["Submit"] = "Senden"; $a->strings["Post from Friendica"] = "Post via Friendica"; $a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen"; From 81297e0284cfe11244bda1fb140b995d646ad770 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 24 Jan 2017 15:51:28 +0100 Subject: [PATCH 48/58] regen WP Post master messages.po, one string was not translatable --- wppost/lang/C/messages.po | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po index 1763b2e31..26fca40a4 100644 --- a/wppost/lang/C/messages.po +++ b/wppost/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: 2017-01-24 15:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,42 +21,46 @@ msgstr "" msgid "Post to Wordpress" msgstr "" -#: wppost.php:76 -msgid "WordPress Post Settings" +#: wppost.php:79 wppost.php:83 +msgid "Wordpress Export" msgstr "" -#: wppost.php:78 +#: wppost.php:86 msgid "Enable WordPress Post Plugin" msgstr "" -#: wppost.php:83 +#: wppost.php:91 msgid "WordPress username" msgstr "" -#: wppost.php:88 +#: wppost.php:96 msgid "WordPress password" msgstr "" -#: wppost.php:93 +#: wppost.php:101 msgid "WordPress API URL" msgstr "" -#: wppost.php:98 +#: wppost.php:106 msgid "Post to WordPress by default" msgstr "" -#: wppost.php:103 +#: wppost.php:111 msgid "Provide a backlink to the Friendica post" msgstr "" -#: wppost.php:110 -msgid "Submit" +#: wppost.php:116 +msgid "Don't post messages that are too short" msgstr "" -#: wppost.php:201 +#: wppost.php:122 +msgid "Save Settings" +msgstr "" + +#: wppost.php:244 msgid "Post from Friendica" msgstr "" -#: wppost.php:207 +#: wppost.php:256 msgid "Read the original post and comment stream on Friendica" msgstr "" From 0318cdcce99b2d8618896f5b509c25b29fcd5bda Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 24 Jan 2017 21:07:01 +0100 Subject: [PATCH 49/58] regen WP Post master messages.po --- wppost/lang/C/messages.po | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po index 26fca40a4..27baa9606 100644 --- a/wppost/lang/C/messages.po +++ b/wppost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 15:50+0100\n" +"POT-Creation-Date: 2017-01-24 21:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,46 +21,52 @@ msgstr "" msgid "Post to Wordpress" msgstr "" -#: wppost.php:79 wppost.php:83 +#: wppost.php:80 wppost.php:84 msgid "Wordpress Export" msgstr "" -#: wppost.php:86 +#: wppost.php:87 msgid "Enable WordPress Post Plugin" msgstr "" -#: wppost.php:91 +#: wppost.php:92 msgid "WordPress username" msgstr "" -#: wppost.php:96 +#: wppost.php:97 msgid "WordPress password" msgstr "" -#: wppost.php:101 +#: wppost.php:102 msgid "WordPress API URL" msgstr "" -#: wppost.php:106 +#: wppost.php:107 msgid "Post to WordPress by default" msgstr "" -#: wppost.php:111 +#: wppost.php:112 msgid "Provide a backlink to the Friendica post" msgstr "" #: wppost.php:116 +msgid "" +"Text for the backlink, e.g. Read the original post and comment stream on " +"Friendica." +msgstr "" + +#: wppost.php:121 msgid "Don't post messages that are too short" msgstr "" -#: wppost.php:122 +#: wppost.php:127 msgid "Save Settings" msgstr "" -#: wppost.php:244 -msgid "Post from Friendica" +#: wppost.php:206 +msgid "Read the orig­i­nal post and com­ment stream on Friendica" msgstr "" -#: wppost.php:256 -msgid "Read the original post and comment stream on Friendica" +#: wppost.php:269 +msgid "Post from Friendica" msgstr "" From 0bd94e6ef75b6595c94038dacda05ee75d6d0271 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 24 Jan 2017 21:07:44 +0100 Subject: [PATCH 50/58] make backlink text configurable for the user --- wppost/wppost.php | 62 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/wppost/wppost.php b/wppost/wppost.php index fc3d3a10a..931b6d818 100755 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -3,7 +3,7 @@ /** * Name: WordPress Post Connector * Description: Post to WordPress (or anything else which uses blogger XMLRPC API) - * Version: 1.0 + * Version: 1.1 * Author: Mike Macgirvin */ @@ -71,6 +71,7 @@ function wppost_settings(&$a,&$s) { $wp_username = get_pconfig(local_user(), 'wppost', 'wp_username'); $wp_password = get_pconfig(local_user(), 'wppost', 'wp_password'); $wp_blog = get_pconfig(local_user(), 'wppost', 'wp_blog'); + $wp_backlink_text = get_pconfig(local_user(), 'wppost', 'wp_backlink_text'); /* Add some HTML to the existing form */ @@ -111,6 +112,10 @@ function wppost_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; $s .= '
'; $s .= ''; @@ -135,6 +140,10 @@ function wppost_settings_post(&$a,&$b) { set_pconfig(local_user(),'wppost','wp_blog',trim($_POST['wp_blog'])); set_pconfig(local_user(),'wppost','backlink',trim($_POST['wp_backlink'])); set_pconfig(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); + $wp_backlink_text = notags(trim($_POST['wp_backlink_text'])); + $wp_backlink_text = bbcode($wp_backlink_text, false, false, 8); + $wp_backlink_text = html2plain($wp_backlink_text, 0, true); + set_pconfig(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); } @@ -144,28 +153,34 @@ function wppost_post_local(&$a,&$b) { // This can probably be changed to allow editing by pointing to a different API endpoint - if($b['edit']) + if($b['edit']) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if((! local_user()) || (local_user() != $b['uid'])) { return; + } - if($b['private'] || $b['parent']) + if($b['private'] || $b['parent']) { return; + } $wp_post = intval(get_pconfig(local_user(),'wppost','post')); $wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0); - if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default'))) + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default'))) { $wp_enable = 1; + } - if(! $wp_enable) + if(! $wp_enable) { return; + } - if(strlen($b['postopts'])) + if(strlen($b['postopts'])) { $b['postopts'] .= ','; - $b['postopts'] .= 'wppost'; + } + $b['postopts'] .= 'wppost'; } @@ -186,6 +201,10 @@ function wppost_send(&$a,&$b) { $wp_username = xmlify(get_pconfig($b['uid'],'wppost','wp_username')); $wp_password = xmlify(get_pconfig($b['uid'],'wppost','wp_password')); $wp_blog = get_pconfig($b['uid'],'wppost','wp_blog'); + $wp_backlink_text = get_pconfig($b['uid'],'wppost','wp_backlink_text'); + if ($wp_backlink_text == '') { + $wp_backlink_text = t('Read the orig­i­nal post and com­ment stream on Friendica'); + } if($wp_username && $wp_password && $wp_blog) { @@ -201,28 +220,34 @@ function wppost_send(&$a,&$b) { $siteinfo = get_attached_data($b["body"]); // Is it a link to an aricle, a video or a photo? - if (isset($siteinfo["type"])) - if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) + if (isset($siteinfo["type"])) { + if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) { $postentry = true; + } + } // Does it have a title? - if ($wptitle != "") + if ($wptitle != "") { $postentry = true; + } // Is it larger than 500 characters? - if (strlen($b['body']) > 500) + if (strlen($b['body']) > 500) { $postentry = true; + } - if (!$postentry) + if (!$postentry) { return; + } } // If the title is empty then try to guess if ($wptitle == '') { // Fetch information about the post $siteinfo = get_attached_data($b["body"]); - if (isset($siteinfo["title"])) + if (isset($siteinfo["title"])) { $wptitle = $siteinfo["title"]; + } // If no bookmark is found then take the first line if ($wptitle == '') { @@ -251,9 +276,10 @@ function wppost_send(&$a,&$b) { $post = $title.$post; $wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink')); - if($wp_backlink && $b['plink']) + if($wp_backlink && $b['plink']) { $post .= EOL . EOL . '' - . t('Read the original post and comment stream on Friendica') . '' . EOL . EOL; + . $wp_backlink_text . '' . EOL . EOL; + } $post = xmlify($post); @@ -276,10 +302,10 @@ EOT; logger('wppost: data: ' . $xml, LOGGER_DATA); - if($wp_blog !== 'test') + if($wp_blog !== 'test') { $x = post_url($wp_blog,$xml); + } logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG); } } - From 578df5cdce0b277c950cd0de80bcbbfd8629ea74 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 9 Feb 2017 15:52:50 +0100 Subject: [PATCH 51/58] use https for link and image --- pledgie/pledgie.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php index 986fd986f..73b9c642f 100644 --- a/pledgie/pledgie.php +++ b/pledgie/pledgie.php @@ -71,9 +71,9 @@ function pledgie_active(&$a,&$b) { $campaign = get_config('pledgie-campaign','text'); $describe = get_config('pledgie-describe','text'); $b .= '
'; - $b .= $describe . '
\'Click\'Click
'; -} \ No newline at end of file +} From 6bbcfb05f6a5450fdc9a4d9c9ac1258239509628 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 9 Feb 2017 19:07:00 +0100 Subject: [PATCH 52/58] some string :wqbeautifications --- pledgie/pledgie.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php index 73b9c642f..e44255a82 100644 --- a/pledgie/pledgie.php +++ b/pledgie/pledgie.php @@ -71,9 +71,9 @@ function pledgie_active(&$a,&$b) { $campaign = get_config('pledgie-campaign','text'); $describe = get_config('pledgie-describe','text'); $b .= '
'; - $b .= $describe . '
Click here to lend your support to: ' . $describe . '!
'; } From 1db595b266df9a9474b4f622c7dd65cc5c56f0ec Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 11 Feb 2017 09:52:04 +0100 Subject: [PATCH 53/58] WP Post update German translation --- wppost/lang/de/messages.po | 51 +++++++++++++++++++++++--------------- wppost/lang/de/strings.php | 8 +++--- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po index b762ab39c..57dde23f2 100644 --- a/wppost/lang/de/messages.po +++ b/wppost/lang/de/messages.po @@ -4,15 +4,16 @@ # # # Translators: +# Andreas H., 2017 # Tobias Diekershoff , 2014-2015 # Tobias Diekershoff , 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-01-24 13:39+0000\n" -"Last-Translator: Tobias Diekershoff \n" +"POT-Creation-Date: 2017-01-24 21:06+0100\n" +"PO-Revision-Date: 2017-02-10 11:11+0000\n" +"Last-Translator: Andreas H.\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" @@ -24,42 +25,52 @@ msgstr "" msgid "Post to Wordpress" msgstr "Bei WordPress veröffentlichen" -#: wppost.php:76 -msgid "WordPress Post Settings" -msgstr "WordPress-Beitragseinstellungen" +#: wppost.php:80 wppost.php:84 +msgid "Wordpress Export" +msgstr "Wordpress Export" -#: wppost.php:78 +#: wppost.php:87 msgid "Enable WordPress Post Plugin" msgstr "WordPress Plugin aktivieren" -#: wppost.php:83 +#: wppost.php:92 msgid "WordPress username" msgstr "WordPress-Benutzername" -#: wppost.php:88 +#: wppost.php:97 msgid "WordPress password" msgstr "WordPress-Passwort" -#: wppost.php:93 +#: wppost.php:102 msgid "WordPress API URL" msgstr "WordPress-API-URL" -#: wppost.php:98 +#: wppost.php:107 msgid "Post to WordPress by default" msgstr "Standardmäßig auf WordPress veröffentlichen" -#: wppost.php:103 +#: wppost.php:112 msgid "Provide a backlink to the Friendica post" msgstr "Einen Link zurück zum Friendica-Beitrag hinzufügen" -#: wppost.php:110 -msgid "Submit" -msgstr "Senden" +#: wppost.php:116 +msgid "" +"Text for the backlink, e.g. Read the original post and comment stream on " +"Friendica." +msgstr "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica." -#: wppost.php:201 +#: wppost.php:121 +msgid "Don't post messages that are too short" +msgstr "Zu kurze Mitteilungen nicht posten" + +#: wppost.php:127 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: wppost.php:206 +msgid "Read the orig­i­nal post and com­ment stream on Friendica" +msgstr "Lies den Original-Post und die Kommentare auf Friendica" + +#: wppost.php:269 msgid "Post from Friendica" msgstr "Post via Friendica" - -#: wppost.php:207 -msgid "Read the original post and comment stream on Friendica" -msgstr "Den Original-Beitrag samt Kommentaren bei Friendica lesen" diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php index a00bf0516..9cdc292a9 100644 --- a/wppost/lang/de/strings.php +++ b/wppost/lang/de/strings.php @@ -6,13 +6,15 @@ function string_plural_select_de($n){ }} ; $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; -$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen"; +$a->strings["Wordpress Export"] = "Wordpress Export"; $a->strings["Enable WordPress Post Plugin"] = "WordPress Plugin aktivieren"; $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; $a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; -$a->strings["Submit"] = "Senden"; +$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica."; +$a->strings["Don't post messages that are too short"] = "Zu kurze Mitteilungen nicht posten"; +$a->strings["Save Settings"] = "Einstellungen speichern"; +$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Lies den Original-Post und die Kommentare auf Friendica"; $a->strings["Post from Friendica"] = "Post via Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen"; From 402b6e5c522ede6ac90bb33150d63be0f442d8a2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 15 Feb 2017 08:22:08 +0100 Subject: [PATCH 54/58] SV translation THX Jonatan Nyberg --- blackout/lang/sv/messages.po | 52 ++++++++++++++++++++++++++++++ blackout/lang/sv/strings.php | 17 ++++++++-- buglink/lang/sv/messages.po | 24 ++++++++++++++ buglink/lang/sv/strings.php | 10 ++++-- forumlist/lang/sv/messages.po | 60 +++++++++++++++++++++++++++++++++++ forumlist/lang/sv/strings.php | 20 ++++++++++-- 6 files changed, 175 insertions(+), 8 deletions(-) create mode 100644 blackout/lang/sv/messages.po create mode 100644 buglink/lang/sv/messages.po create mode 100644 forumlist/lang/sv/messages.po diff --git a/blackout/lang/sv/messages.po b/blackout/lang/sv/messages.po new file mode 100644 index 000000000..2bb3aba46 --- /dev/null +++ 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 , 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 \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 YYYY year, MM month, DD day, " +"hh hour and mm 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 "" diff --git a/blackout/lang/sv/strings.php b/blackout/lang/sv/strings.php index 3ec569a78..f467211ac 100644 --- a/blackout/lang/sv/strings.php +++ b/blackout/lang/sv/strings.php @@ -1,3 +1,14 @@ -strings["Submit"] = "Spara"; +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 YYYY year, MM month, DD day, hh hour and mm 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."] = ""; diff --git a/buglink/lang/sv/messages.po b/buglink/lang/sv/messages.po new file mode 100644 index 000000000..7dbaf0e69 --- /dev/null +++ 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 , 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 \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" diff --git a/buglink/lang/sv/strings.php b/buglink/lang/sv/strings.php index ab4fa67a0..513dd4f3d 100644 --- a/buglink/lang/sv/strings.php +++ b/buglink/lang/sv/strings.php @@ -1,2 +1,8 @@ -strings["Report Bug"] = "Rapportera bugg"; diff --git a/forumlist/lang/sv/messages.po b/forumlist/lang/sv/messages.po new file mode 100644 index 000000000..a16497d26 --- /dev/null +++ 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 , 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 \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" diff --git a/forumlist/lang/sv/strings.php b/forumlist/lang/sv/strings.php index 3ec569a78..f2fe884bb 100644 --- a/forumlist/lang/sv/strings.php +++ b/forumlist/lang/sv/strings.php @@ -1,3 +1,17 @@ -strings["Submit"] = "Spara"; +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"; From 1baa4c36d7cb6dcf925a29fdcc974c600d55c80a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Feb 2017 14:00:49 +0100 Subject: [PATCH 55/58] ES notifyall THX Albert --- notifyall/lang/es/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notifyall/lang/es/messages.po b/notifyall/lang/es/messages.po index 5d2536fed..441853213 100644 --- a/notifyall/lang/es/messages.po +++ b/notifyall/lang/es/messages.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-14 16:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Alberto Díaz Tormo , 2016\n" +"Last-Translator: Albert , 2016\n" "Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 5549db970273bca90bd13419f6929f0fbdb2839c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Feb 2017 14:01:49 +0100 Subject: [PATCH 56/58] ES wppost THX Albert --- wppost/lang/es/messages.po | 50 +++++++++++++++++++++++--------------- wppost/lang/es/strings.php | 8 +++--- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po index 98365fb19..baac8034b 100644 --- a/wppost/lang/es/messages.po +++ b/wppost/lang/es/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# Albert, 2016 +# Albert, 2016-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: 2016-11-19 11:38+0000\n" +"POT-Creation-Date: 2017-01-24 21:06+0100\n" +"PO-Revision-Date: 2017-02-25 22:42+0000\n" "Last-Translator: Albert\n" "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" "MIME-Version: 1.0\n" @@ -23,42 +23,52 @@ msgstr "" msgid "Post to Wordpress" msgstr "Publicar en Wordpress" -#: wppost.php:76 -msgid "WordPress Post Settings" -msgstr "Ajustes de publicación de WordPress" +#: wppost.php:80 wppost.php:84 +msgid "Wordpress Export" +msgstr "Exportar a Wordpress" -#: wppost.php:78 +#: wppost.php:87 msgid "Enable WordPress Post Plugin" msgstr "Habilitar Plugin de publicación de WordPress" -#: wppost.php:83 +#: wppost.php:92 msgid "WordPress username" msgstr "Nombre de usuario de WordPress" -#: wppost.php:88 +#: wppost.php:97 msgid "WordPress password" msgstr "Contraseña de WordPress" -#: wppost.php:93 +#: wppost.php:102 msgid "WordPress API URL" msgstr "URL de API de WordPress" -#: wppost.php:98 +#: wppost.php:107 msgid "Post to WordPress by default" msgstr "Publicar en WordPress por defecto" -#: wppost.php:103 +#: wppost.php:112 msgid "Provide a backlink to the Friendica post" msgstr "Proveer un enlace inverso a la entrada de Friendica" -#: wppost.php:110 -msgid "Submit" -msgstr "Enviar" +#: wppost.php:116 +msgid "" +"Text for the backlink, e.g. Read the original post and comment stream on " +"Friendica." +msgstr "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica." -#: wppost.php:201 +#: wppost.php:121 +msgid "Don't post messages that are too short" +msgstr "No escriba mensajes demasiado cortos" + +#: wppost.php:127 +msgid "Save Settings" +msgstr "Guardar configuración" + +#: wppost.php:206 +msgid "Read the orig­i­nal post and com­ment stream on Friendica" +msgstr "Leer la publicación original y comente en Friendica" + +#: wppost.php:269 msgid "Post from Friendica" msgstr "Publicar desde Friendica" - -#: wppost.php:207 -msgid "Read the original post and comment stream on Friendica" -msgstr "Leer la entrada original y transmitir comentarios en Friendica" diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php index 525cb8834..137533118 100644 --- a/wppost/lang/es/strings.php +++ b/wppost/lang/es/strings.php @@ -6,13 +6,15 @@ function string_plural_select_es($n){ }} ; $a->strings["Post to Wordpress"] = "Publicar en Wordpress"; -$a->strings["WordPress Post Settings"] = "Ajustes de publicación de WordPress"; +$a->strings["Wordpress Export"] = "Exportar a Wordpress"; $a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress"; $a->strings["WordPress username"] = "Nombre de usuario de WordPress"; $a->strings["WordPress password"] = "Contraseña de WordPress"; $a->strings["WordPress API URL"] = "URL de API de WordPress"; $a->strings["Post to WordPress by default"] = "Publicar en WordPress por defecto"; $a->strings["Provide a backlink to the Friendica post"] = "Proveer un enlace inverso a la entrada de Friendica"; -$a->strings["Submit"] = "Enviar"; +$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica."; +$a->strings["Don't post messages that are too short"] = "No escriba mensajes demasiado cortos"; +$a->strings["Save Settings"] = "Guardar configuración"; +$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Leer la publicación original y comente en Friendica"; $a->strings["Post from Friendica"] = "Publicar desde Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Leer la entrada original y transmitir comentarios en Friendica"; From ad46da0669ceb459d2bbdcb336bf6f6300a178b9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Feb 2017 14:02:51 +0100 Subject: [PATCH 57/58] ES wppost THX Fabrixxm --- wppost/lang/it/messages.po | 48 +++++++++++++++++++++++--------------- wppost/lang/it/strings.php | 8 ++++--- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/wppost/lang/it/messages.po b/wppost/lang/it/messages.po index c6b7ee18b..2369d955d 100644 --- a/wppost/lang/it/messages.po +++ b/wppost/lang/it/messages.po @@ -9,8 +9,8 @@ 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:30+0000\n" +"POT-Creation-Date: 2017-01-24 21:06+0100\n" +"PO-Revision-Date: 2017-02-10 08:18+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -23,42 +23,52 @@ msgstr "" msgid "Post to Wordpress" msgstr "Invia a Wordpress" -#: wppost.php:76 -msgid "WordPress Post Settings" -msgstr "Impostazioni invio a WordPress" +#: wppost.php:80 wppost.php:84 +msgid "Wordpress Export" +msgstr "" -#: wppost.php:78 +#: wppost.php:87 msgid "Enable WordPress Post Plugin" msgstr "Abilita il plugin di invio a Wordpress" -#: wppost.php:83 +#: wppost.php:92 msgid "WordPress username" msgstr "Nome utente Wordpress" -#: wppost.php:88 +#: wppost.php:97 msgid "WordPress password" msgstr "Password Wordpress" -#: wppost.php:93 +#: wppost.php:102 msgid "WordPress API URL" msgstr "Indirizzo API Wordpress" -#: wppost.php:98 +#: wppost.php:107 msgid "Post to WordPress by default" msgstr "Invia sempre a Wordpress" -#: wppost.php:103 +#: wppost.php:112 msgid "Provide a backlink to the Friendica post" msgstr "Inserisci un link al messaggio originale su Friendica" -#: wppost.php:110 -msgid "Submit" -msgstr "Invia" +#: wppost.php:116 +msgid "" +"Text for the backlink, e.g. Read the original post and comment stream on " +"Friendica." +msgstr "" -#: wppost.php:201 +#: wppost.php:121 +msgid "Don't post messages that are too short" +msgstr "" + +#: wppost.php:127 +msgid "Save Settings" +msgstr "" + +#: wppost.php:206 +msgid "Read the orig­i­nal post and com­ment stream on Friendica" +msgstr "" + +#: wppost.php:269 msgid "Post from Friendica" msgstr "Messaggio da Friendica" - -#: wppost.php:207 -msgid "Read the original post and comment stream on Friendica" -msgstr "Leggi il messaggio originale e i commenti su Friendica" diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php index 0d6b184ec..3f616900e 100644 --- a/wppost/lang/it/strings.php +++ b/wppost/lang/it/strings.php @@ -6,13 +6,15 @@ function string_plural_select_it($n){ }} ; $a->strings["Post to Wordpress"] = "Invia a Wordpress"; -$a->strings["WordPress Post Settings"] = "Impostazioni invio a WordPress"; +$a->strings["Wordpress Export"] = ""; $a->strings["Enable WordPress Post Plugin"] = "Abilita il plugin di invio a Wordpress"; $a->strings["WordPress username"] = "Nome utente Wordpress"; $a->strings["WordPress password"] = "Password Wordpress"; $a->strings["WordPress API URL"] = "Indirizzo API Wordpress"; $a->strings["Post to WordPress by default"] = "Invia sempre a Wordpress"; $a->strings["Provide a backlink to the Friendica post"] = "Inserisci un link al messaggio originale su Friendica"; -$a->strings["Submit"] = "Invia"; +$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = ""; +$a->strings["Don't post messages that are too short"] = ""; +$a->strings["Save Settings"] = ""; +$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = ""; $a->strings["Post from Friendica"] = "Messaggio da Friendica"; -$a->strings["Read the original post and comment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica"; From 12994aaccd3fc3f26d470a2638b489a90b1f8e92 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 9 Mar 2017 06:58:36 +0000 Subject: [PATCH 58/58] Deprecated parts removed --- appnet/appnet.php | 62 ++++-------------- buffer/buffer.php | 19 +++--- pumpio/pumpio.php | 15 ++--- pumpio/pumpio_sync.php | 26 ++++---- statusnet/statusnet.php | 66 ++++--------------- twitter/twitter.php | 136 +++++++++++++++------------------------ twitter/twitter_sync.php | 26 ++++---- 7 files changed, 118 insertions(+), 232 deletions(-) diff --git a/appnet/appnet.php b/appnet/appnet.php index 0c53a49f4..042b2f8c1 100644 --- 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 + * 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']) - ); } } diff --git a/buffer/buffer.php b/buffer/buffer.php index 162600d64..89000c1ff 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -1,7 +1,7 @@ */ @@ -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) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 65f555525..fb7ce8c1e 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -976,8 +976,8 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { // 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)", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", intval($uid), dbesc(datetime_convert()), dbesc($contact->url), @@ -992,6 +992,8 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { dbesc(NETWORK_PUMPIO), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location->displayName), + dbesc($contact->summary), intval(1) ); @@ -1014,15 +1016,6 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { require_once('include/group.php'); group_add_member($uid,'',$contact_id,$g[0]['def_gid']); } - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location->displayName), - dbesc($contact->summary), - intval($contact_id) - ); } else { $contact_id = $r[0]["id"]; diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php index 346376fa0..af843c1d7 100644 --- a/pumpio/pumpio_sync.php +++ b/pumpio/pumpio_sync.php @@ -41,21 +41,23 @@ function pumpio_sync_run(&$argv, &$argc){ } } - $lockpath = get_lockpath(); - if ($lockpath != '') { - $pidfile = new pidfile($lockpath, 'pumpio_sync'); - if($pidfile->is_already_running()) { - logger("Already running"); - if ($pidfile->running_time() > 9*60) { - $pidfile->kill(); - logger("killed stale process"); - // Calling a new instance - proc_run('php','addon/pumpio/pumpio_sync.php'); + // This is deprecated with the worker + if (function_exists("get_lockpath")) { + $lockpath = get_lockpath(); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'pumpio_sync'); + if($pidfile->is_already_running()) { + logger("Already running"); + if ($pidfile->running_time() > 9*60) { + $pidfile->kill(); + logger("killed stale process"); + // Calling a new instance + proc_run('php','addon/pumpio/pumpio_sync.php'); + } + exit; } - exit; } } - pumpio_sync($a); } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index bc9bc125f..9c44ef023 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -920,36 +920,11 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { if ($contact->statusnet_profile_url == "") return(-1); - if (function_exists("update_gcontact")) - update_gcontact(array("url" => $contact->statusnet_profile_url, - "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url, - "name" => $contact->name, "nick" => $contact->screen_name, - "location" => $contact->location, "about" => $contact->description, - "addr" => statusnet_address($contact), "generation" => 3)); - else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link($contact->statusnet_profile_url))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link($contact->statusnet_profile_url)), - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($contact->profile_image_url)); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($contact->profile_image_url), - dbesc(normalise_link($contact->statusnet_profile_url))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location), - dbesc($contact->description), - dbesc(normalise_link($contact->statusnet_profile_url))); - } + update_gcontact(array("url" => $contact->statusnet_profile_url, + "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url, + "name" => $contact->name, "nick" => $contact->screen_name, + "location" => $contact->location, "about" => $contact->description, + "addr" => statusnet_address($contact), "generation" => 3)); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET)); @@ -966,8 +941,8 @@ function statusnet_fetch_contact($uid, $contact, $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 ) ", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ", intval($uid), dbesc(datetime_convert()), dbesc($contact->statusnet_profile_url), @@ -982,6 +957,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { dbesc(NETWORK_STATUSNET), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location), + dbesc($contact->description), intval(1) ); @@ -1019,16 +996,6 @@ function statusnet_fetch_contact($uid, $contact, $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($contact->location), - dbesc($contact->description), - intval($contact_id) - ); - } else { // update profile photos once every two weeks as we have no notification of when they change. @@ -1055,7 +1022,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { `nurl` = '%s', `addr` = '%s', `name` = '%s', - `nick` = '%s' + `nick` = '%s', + `location` = '%s', + `about` = '%s' WHERE `id` = %d", dbesc($photos[0]), dbesc($photos[1]), @@ -1068,17 +1037,10 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { dbesc(statusnet_address($contact)), dbesc($contact->name), dbesc($contact->screen_name), + dbesc($contact->location), + dbesc($contact->description), intval($r[0]['id']) ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location), - dbesc($contact->description), - intval($r[0]['id']) - ); } } diff --git a/twitter/twitter.php b/twitter/twitter.php index 0f074ba31..74121d295 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -935,36 +935,11 @@ function twitter_fetch_contact($uid, $contact, $create_user) { $avatar = twitter_fix_avatar($contact->profile_image_url_https); - if (function_exists("update_gcontact")) - update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name, - "network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true, - "name" => $contact->name, "nick" => $contact->screen_name, - "location" => $contact->location, "about" => $contact->description, - "addr" => $contact->screen_name."@twitter.com", "generation" => 2)); - else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($avatar)); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($avatar), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location), - dbesc($contact->description), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - } + update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name, + "network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true, + "name" => $contact->name, "nick" => $contact->screen_name, + "location" => $contact->location, "about" => $contact->description, + "addr" => $contact->screen_name."@twitter.com", "generation" => 2)); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", intval($uid), dbesc("twitter::".$contact->id_str)); @@ -979,10 +954,10 @@ function twitter_fetch_contact($uid, $contact, $create_user) { if(!count($r)) { // create contact record - q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + 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) ", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending`) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", intval($uid), dbesc(datetime_convert()), dbesc("https://twitter.com/".$contact->screen_name), @@ -997,6 +972,8 @@ function twitter_fetch_contact($uid, $contact, $create_user) { dbesc(NETWORK_TWITTER), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location), + dbesc($contact->description), intval(1) ); @@ -1021,33 +998,25 @@ function twitter_fetch_contact($uid, $contact, $create_user) { require_once("Photo.php"); - $photos = import_profile_photo($avatar,$uid,$contact_id); + $photos = import_profile_photo($avatar, $uid, $contact_id, true); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($contact_id) - ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' + if ($photos) { + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' WHERE `id` = %d", - dbesc($contact->location), - dbesc($contact->description), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), intval($contact_id) ); - + } } else { // update profile photos once every two weeks as we have no notification of when they change. @@ -1062,42 +1031,39 @@ function twitter_fetch_contact($uid, $contact, $create_user) { require_once("Photo.php"); - $photos = import_profile_photo($avatar, $uid, $r[0]['id']); + $photos = import_profile_photo($avatar, $uid, $r[0]['id'], true); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `url` = '%s', - `nurl` = '%s', - `addr` = '%s', - `name` = '%s', - `nick` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc("https://twitter.com/".$contact->screen_name), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), - dbesc($contact->screen_name."@twitter.com"), - dbesc($contact->name), - dbesc($contact->screen_name), - intval($r[0]['id']) - ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', + if ($photos) { + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `url` = '%s', + `nurl` = '%s', + `addr` = '%s', + `name` = '%s', + `nick` = '%s', + `location` = '%s', `about` = '%s' WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc("https://twitter.com/".$contact->screen_name), + dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), + dbesc($contact->screen_name."@twitter.com"), + dbesc($contact->name), + dbesc($contact->screen_name), dbesc($contact->location), dbesc($contact->description), intval($r[0]['id']) ); + } } } diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php index 434cb2042..6c76af7ce 100644 --- a/twitter/twitter_sync.php +++ b/twitter/twitter_sync.php @@ -49,19 +49,21 @@ function twitter_sync_run($argv, $argc){ $mode = intval($argv[1]); $uid = intval($argv[2]); - /// @todo Replace it with "App::is_already_running" in the next release - $lockpath = get_lockpath(); - if ($lockpath != '') { - $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); - if ($pidfile->is_already_running()) { - logger("Already running"); - if ($pidfile->running_time() > 9*60) { - $pidfile->kill(); - logger("killed stale process"); - // Calling a new instance - proc_run('php','addon/twitter/twitter_sync.php', $mode, $uid); + // This is deprecated with the worker + if (function_exists("get_lockpath")) { + $lockpath = get_lockpath(); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); + if ($pidfile->is_already_running()) { + logger("Already running"); + if ($pidfile->running_time() > 9*60) { + $pidfile->kill(); + logger("killed stale process"); + // Calling a new instance + proc_run('php','addon/twitter/twitter_sync.php', $mode, $uid); + } + exit; } - exit; } }