From ef27a1ce6c3cdb6f08584e76fa0c012377cadc49 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 8 Nov 2017 19:21:36 -0800 Subject: use logger --- include/zot.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 0aa50ab92..40e303bf1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2010,8 +2010,7 @@ function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) { // may have a different owner than the one being transmitted. if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) { - /// @fixme shouldn't this be logger? - notice('sender is not owner or author'); + logger('sender is not owner or author'); return; } -- cgit v1.2.3 From 412f177c56a54cc9d3c9b40236141b0bc35d3361 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 14 Dec 2017 10:24:16 +0100 Subject: bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index c27247623..2917410b4 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,7 @@ require_once('include/hubloc.php'); require_once('include/attach.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.0RC' ); +define ( 'STD_VERSION', '3.1' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1198 ); -- cgit v1.2.3 From a07b5ba4ddd0031000cb86b5c604b1f73ade8024 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 14 Dec 2017 21:48:30 +0100 Subject: make remote homelink link to the home host and not to the home channel --- include/nav.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/nav.php b/include/nav.php index 2366fe7f1..8566cc58c 100644 --- a/include/nav.php +++ b/include/nav.php @@ -176,13 +176,15 @@ EOT; } - - $homelink = get_my_url(); - if(! $homelink) { + $my_url = get_my_url(); + if(! $my_url) { $observer = App::get_observer(); - $homelink = (($observer) ? $observer['xchan_url'] : ''); + $my_url = (($observer) ? $observer['xchan_url'] : ''); } + $homelink_arr = parse_url($my_url); + $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host']; + if(! $is_owner) { $nav['rusermenu'] = array( $homelink, -- cgit v1.2.3 From a61c72b3b2076a5971eca47cda8aa067c03f9d6c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 14 Dec 2017 22:10:56 +0100 Subject: fix some more PHP7.2 warnings --- include/conversation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index fc0942474..77694deb3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -755,8 +755,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa 'forged' => $forged, 'txt_cats' => t('Categories:'), 'txt_folders' => t('Filed under:'), - 'has_cats' => ((count($body['categories'])) ? 'true' : ''), - 'has_folders' => ((count($body['folders'])) ? 'true' : ''), + 'has_cats' => (($body['categories']) ? 'true' : ''), + 'has_folders' => (($body['folders']) ? 'true' : ''), 'text' => strip_tags($body['html']), 'ago' => relative_date($item['created']), 'app' => $item['app'], -- cgit v1.2.3 From 869126259b4089f235d1e9e27e67555611c98d24 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Dec 2017 13:30:31 -0800 Subject: hubzilla issue #928 --- view/tpl/msg-header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index d71d432fb..b6856f139 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -26,7 +26,7 @@ }); $('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); - $('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); + $('#prvmail-attach-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); }); -- cgit v1.2.3 From f965d9dc9e520800f0fe8e198c31f10e12379c88 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Dec 2017 13:38:56 -0800 Subject: wrong constant name --- Zotlabs/Module/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 37a3a3a85..6365230f8 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -156,7 +156,7 @@ class Item extends \Zotlabs\Web\Controller { if(! x($_REQUEST,'type')) $_REQUEST['type'] = 'net-comment'; - if($obj_type == ACTIVITY_OBJ_POST) + if($obj_type == ACTIVITY_OBJ_NOTE) $obj_type = ACTIVITY_OBJ_COMMENT; if($parent) { -- cgit v1.2.3 From 26b92c85641f0c4c4bda683456106c4ad21caa86 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 14 Dec 2017 22:41:11 +0100 Subject: fix another PHP7.2 warningg --- Zotlabs/Module/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 37a3a3a85..6365230f8 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -156,7 +156,7 @@ class Item extends \Zotlabs\Web\Controller { if(! x($_REQUEST,'type')) $_REQUEST['type'] = 'net-comment'; - if($obj_type == ACTIVITY_OBJ_POST) + if($obj_type == ACTIVITY_OBJ_NOTE) $obj_type = ACTIVITY_OBJ_COMMENT; if($parent) { -- cgit v1.2.3 From 5c5fc0a62f892f20c2a5a21acf2932ef6a327ad7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 Dec 2017 08:51:05 +0100 Subject: only use effective uid if we deal with sys channel content --- Zotlabs/Module/Hq.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 073b67b92..1e46a6353 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -98,6 +98,8 @@ class Hq extends \Zotlabs\Web\Controller { $sys = get_sys_channel(); $sql_extra = item_permissions_sql($sys['channel_id']); + $sys_item = false; + } if(! $update) { @@ -215,6 +217,8 @@ class Hq extends \Zotlabs\Web\Controller { } if(!$r) { + $sys_item = true; + $r = q("SELECT item.id AS item_id FROM item LEFT JOIN abook ON item.author_xchan = abook.abook_xchan WHERE mid = '%s' AND item.uid = %d $item_normal @@ -243,6 +247,8 @@ class Hq extends \Zotlabs\Web\Controller { } if(!$r) { + $sys_item = true; + $r = q("SELECT item.parent AS item_id FROM item LEFT JOIN abook ON item.author_xchan = abook.abook_xchan WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update @@ -268,7 +274,7 @@ class Hq extends \Zotlabs\Web\Controller { dbesc($parents_str) ); - xchan_query($items,true,local_channel()); + xchan_query($items,true,(($sys_item) ? local_channel() : 0)); $items = fetch_post_tags($items,true); $items = conv_sort($items,'created'); } -- cgit v1.2.3 From 55f3198c9c3a890852ad2f0209e6e76216c4661b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Sat, 16 Dec 2017 10:55:46 +0100 Subject: Updated Spanish translation. --- view/es-es/hmessages.po | 2899 +++++++++++++++++++++++++---------------------- view/es-es/hstrings.php | 84 +- 2 files changed, 1572 insertions(+), 1411 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 67be6a829..8f6b8cb4e 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -5,17 +5,18 @@ # Translators: # alfonsomthd , 2015 # inboxwall , 2015 -# jeroenpraat , 2015 -# Manuel Jiménez Friaza , 2015-2017 +# jeroenpraat , 2015 +# Manuel Jiménez Friaza , 2017 +# Manuel Jiménez Friaza , 2015-2017 # Rafael, 2015 # tony baldwin , 2014 msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-19 12:01+0200\n" -"PO-Revision-Date: 2017-10-28 10:20+0000\n" -"Last-Translator: Manuel Jiménez Friaza \n" +"POT-Creation-Date: 2017-12-13 12:54+0100\n" +"PO-Revision-Date: 2017-12-16 09:43+0000\n" +"Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,168 +24,169 @@ msgstr "" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../Zotlabs/Access/Permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my channel stream and posts" msgstr "Pueden verse la actividad y publicaciones de mi canal" -#: ../../Zotlabs/Access/Permissions.php:54 +#: ../../Zotlabs/Access/Permissions.php:57 msgid "Can send me their channel stream and posts" msgstr "Se me pueden enviar entradas y contenido de un canal" -#: ../../Zotlabs/Access/Permissions.php:55 +#: ../../Zotlabs/Access/Permissions.php:58 msgid "Can view my default channel profile" msgstr "Puede verse mi perfil de canal predeterminado." -#: ../../Zotlabs/Access/Permissions.php:56 +#: ../../Zotlabs/Access/Permissions.php:59 msgid "Can view my connections" msgstr "Pueden verse mis conexiones" -#: ../../Zotlabs/Access/Permissions.php:57 +#: ../../Zotlabs/Access/Permissions.php:60 msgid "Can view my file storage and photos" msgstr "Pueden verse mi repositorio de ficheros y mis fotos" -#: ../../Zotlabs/Access/Permissions.php:58 +#: ../../Zotlabs/Access/Permissions.php:61 msgid "Can upload/modify my file storage and photos" msgstr "Se pueden subir / modificar elementos en mi repositorio de ficheros y fotos" -#: ../../Zotlabs/Access/Permissions.php:59 +#: ../../Zotlabs/Access/Permissions.php:62 msgid "Can view my channel webpages" msgstr "Pueden verse las páginas personales de mi canal" -#: ../../Zotlabs/Access/Permissions.php:60 +#: ../../Zotlabs/Access/Permissions.php:63 msgid "Can view my wiki pages" msgstr "Pueden verse mis páginas wiki" -#: ../../Zotlabs/Access/Permissions.php:61 +#: ../../Zotlabs/Access/Permissions.php:64 msgid "Can create/edit my channel webpages" msgstr "Pueden crearse / modificarse páginas personales en mi canal" -#: ../../Zotlabs/Access/Permissions.php:62 +#: ../../Zotlabs/Access/Permissions.php:65 msgid "Can write to my wiki pages" msgstr "Se pueden modificar las páginas de mi wiki" -#: ../../Zotlabs/Access/Permissions.php:63 +#: ../../Zotlabs/Access/Permissions.php:66 msgid "Can post on my channel (wall) page" msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)" -#: ../../Zotlabs/Access/Permissions.php:64 +#: ../../Zotlabs/Access/Permissions.php:67 msgid "Can comment on or like my posts" msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'." -#: ../../Zotlabs/Access/Permissions.php:65 +#: ../../Zotlabs/Access/Permissions.php:68 msgid "Can send me private mail messages" msgstr "Se me pueden enviar mensajes privados" -#: ../../Zotlabs/Access/Permissions.php:66 +#: ../../Zotlabs/Access/Permissions.php:69 msgid "Can like/dislike profiles and profile things" msgstr "Se puede mostrar agrado o desagrado (Me gusta / No me gusta) en mis perfiles y sus distintos apartados" -#: ../../Zotlabs/Access/Permissions.php:67 +#: ../../Zotlabs/Access/Permissions.php:70 msgid "Can forward to all my channel connections via @+ mentions in posts" msgstr "Pueden reenviarse publicaciones a todas las conexiones de mi canal a través de @+ menciones en las entradas" -#: ../../Zotlabs/Access/Permissions.php:68 +#: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" msgstr "Se puede chatear conmigo" -#: ../../Zotlabs/Access/Permissions.php:69 +#: ../../Zotlabs/Access/Permissions.php:72 msgid "Can source my public posts in derived channels" msgstr "Pueden utilizarse mis entradas públicas como origen de contenidos en canales derivados" -#: ../../Zotlabs/Access/Permissions.php:70 +#: ../../Zotlabs/Access/Permissions.php:73 msgid "Can administer my channel" msgstr "Se puede administrar mi canal" -#: ../../Zotlabs/Access/PermissionRoles.php:248 +#: ../../Zotlabs/Access/PermissionRoles.php:265 msgid "Social Networking" msgstr "Redes sociales" -#: ../../Zotlabs/Access/PermissionRoles.php:249 +#: ../../Zotlabs/Access/PermissionRoles.php:266 msgid "Social - Mostly Public" msgstr "Social - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:250 +#: ../../Zotlabs/Access/PermissionRoles.php:267 msgid "Social - Restricted" msgstr "Social - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:251 +#: ../../Zotlabs/Access/PermissionRoles.php:268 msgid "Social - Private" msgstr "Social - Privado" -#: ../../Zotlabs/Access/PermissionRoles.php:254 +#: ../../Zotlabs/Access/PermissionRoles.php:271 msgid "Community Forum" msgstr "Foro de discusión" -#: ../../Zotlabs/Access/PermissionRoles.php:255 +#: ../../Zotlabs/Access/PermissionRoles.php:272 msgid "Forum - Mostly Public" msgstr "Foro - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:256 +#: ../../Zotlabs/Access/PermissionRoles.php:273 msgid "Forum - Restricted" msgstr "Foro - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:257 +#: ../../Zotlabs/Access/PermissionRoles.php:274 msgid "Forum - Private" msgstr "Foro - Privado" -#: ../../Zotlabs/Access/PermissionRoles.php:260 +#: ../../Zotlabs/Access/PermissionRoles.php:277 msgid "Feed Republish" msgstr "Republicar un \"feed\"" -#: ../../Zotlabs/Access/PermissionRoles.php:261 +#: ../../Zotlabs/Access/PermissionRoles.php:278 msgid "Feed - Mostly Public" msgstr "Feed - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:262 +#: ../../Zotlabs/Access/PermissionRoles.php:279 msgid "Feed - Restricted" msgstr "Feed - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:265 +#: ../../Zotlabs/Access/PermissionRoles.php:282 msgid "Special Purpose" msgstr "Propósito especial" -#: ../../Zotlabs/Access/PermissionRoles.php:266 +#: ../../Zotlabs/Access/PermissionRoles.php:283 msgid "Special - Celebrity/Soapbox" msgstr "Especial - Celebridad / Tribuna improvisada" -#: ../../Zotlabs/Access/PermissionRoles.php:267 +#: ../../Zotlabs/Access/PermissionRoles.php:284 msgid "Special - Group Repository" msgstr "Especial - Repositorio de grupo" -#: ../../Zotlabs/Access/PermissionRoles.php:270 +#: ../../Zotlabs/Access/PermissionRoles.php:287 #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Settings/Channel.php:467 +#: ../../Zotlabs/Module/Settings/Channel.php:474 #: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:213 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:221 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1297 -#: ../../include/event.php:1304 ../../include/connections.php:689 +#: ../../include/selectors.php:140 ../../include/event.php:1308 +#: ../../include/event.php:1315 ../../include/connections.php:689 #: ../../include/connections.php:696 msgid "Other" msgstr "Otro" -#: ../../Zotlabs/Access/PermissionRoles.php:271 +#: ../../Zotlabs/Access/PermissionRoles.php:288 msgid "Custom/Expert Mode" msgstr "Modo personalizado/experto" -#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29 +#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Cards.php:29 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1163 +#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198 msgid "Requested profile is not available." msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 #: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Article_edit.php:51 #: ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 @@ -196,19 +198,19 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:388 +#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 -#: ../../Zotlabs/Module/Profile_photo.php:288 -#: ../../Zotlabs/Module/Profile_photo.php:301 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223 -#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250 -#: ../../Zotlabs/Module/Item.php:1102 ../../Zotlabs/Module/Page.php:34 -#: ../../Zotlabs/Module/Page.php:125 ../../Zotlabs/Module/Connedit.php:389 +#: ../../Zotlabs/Module/Profile_photo.php:294 +#: ../../Zotlabs/Module/Profile_photo.php:307 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:228 +#: ../../Zotlabs/Module/Item.php:245 ../../Zotlabs/Module/Item.php:255 +#: ../../Zotlabs/Module/Item.php:1085 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 #: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Profiles.php:198 -#: ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 @@ -216,32 +218,32 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Cards.php:68 ../../Zotlabs/Module/Webpages.php:118 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Suggest.php:28 +#: ../../Zotlabs/Module/Like.php:184 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:343 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:404 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 -#: ../../Zotlabs/Module/Filestorage.php:112 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Notifications.php:11 -#: ../../Zotlabs/Lib/Chatroom.php:137 ../../Zotlabs/Web/WebServer.php:169 +#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:169 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 #: ../../addon/gitwiki/Mod_Gitwiki.php:196 #: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40 -#: ../../include/attach.php:144 ../../include/attach.php:191 -#: ../../include/attach.php:255 ../../include/attach.php:269 -#: ../../include/attach.php:276 ../../include/attach.php:344 -#: ../../include/attach.php:358 ../../include/attach.php:365 -#: ../../include/attach.php:443 ../../include/attach.php:924 -#: ../../include/attach.php:998 ../../include/attach.php:1163 -#: ../../include/items.php:3489 ../../include/photos.php:28 +#: ../../include/attach.php:150 ../../include/attach.php:197 +#: ../../include/attach.php:270 ../../include/attach.php:284 +#: ../../include/attach.php:293 ../../include/attach.php:366 +#: ../../include/attach.php:380 ../../include/attach.php:387 +#: ../../include/attach.php:469 ../../include/attach.php:1008 +#: ../../include/attach.php:1082 ../../include/attach.php:1247 +#: ../../include/items.php:3633 ../../include/photos.php:27 msgid "Permission denied." msgstr "Acceso denegado." @@ -268,58 +270,60 @@ msgstr "Creado" msgid "Edited" msgstr "Editado" -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Cdav.php:1185 -#: ../../Zotlabs/Module/New_channel.php:147 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:147 #: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Menu.php:118 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Cards.php:96 ../../Zotlabs/Module/Webpages.php:239 -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:335 -#: ../../Zotlabs/Widget/Cdav.php:127 ../../Zotlabs/Widget/Cdav.php:164 +#: ../../Zotlabs/Storage/Browser.php:273 ../../Zotlabs/Storage/Browser.php:379 +#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" msgstr "Crear" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 +#: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:149 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Connections.php:260 #: ../../Zotlabs/Module/Connections.php:297 #: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:346 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Layouts.php:193 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:399 -#: ../../Zotlabs/Lib/ThreadItem.php:111 ../../Zotlabs/Storage/Browser.php:239 -#: ../../Zotlabs/Widget/Cdav.php:125 ../../Zotlabs/Widget/Cdav.php:161 +#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:285 +#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 #: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1262 -#: ../../include/channel.php:1266 ../../include/menu.php:113 +#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297 +#: ../../include/channel.php:1301 ../../include/menu.php:113 msgid "Edit" msgstr "Editar" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1049 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 #: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241 -#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1346 +#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363 msgid "Share" msgstr "Compartir" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 +#: ../../Zotlabs/Module/Article_edit.php:129 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Connections.php:268 -#: ../../Zotlabs/Module/Photos.php:1150 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 #: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Group.php:179 #: ../../Zotlabs/Module/Profiles.php:803 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:400 -#: ../../Zotlabs/Lib/ThreadItem.php:131 ../../Zotlabs/Storage/Browser.php:240 -#: ../../include/conversation.php:674 ../../include/conversation.php:717 +#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:286 +#: ../../include/conversation.php:690 ../../include/conversation.php:733 msgid "Delete" msgstr "Eliminar" @@ -402,7 +406,7 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:148 +#: ../../Zotlabs/Module/Appman.php:152 #: ../../Zotlabs/Module/Import_items.php:129 #: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 @@ -412,59 +416,60 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:273 +#: ../../Zotlabs/Module/Admin/Site.php:277 #: ../../Zotlabs/Module/Admin/Profs.php:157 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 #: ../../Zotlabs/Module/Admin/Security.php:104 #: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:480 +#: ../../Zotlabs/Module/Settings/Channel.php:489 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Tokens.php:168 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:52 -#: ../../Zotlabs/Module/Settings/Display.php:207 +#: ../../Zotlabs/Module/Settings/Display.php:209 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 -#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:343 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:659 -#: ../../Zotlabs/Module/Photos.php:1029 ../../Zotlabs/Module/Photos.php:1069 -#: ../../Zotlabs/Module/Photos.php:1187 ../../Zotlabs/Module/Wiki.php:206 -#: ../../Zotlabs/Module/Pdledit.php:94 ../../Zotlabs/Module/Poke.php:200 -#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Chat.php:196 -#: ../../Zotlabs/Module/Chat.php:242 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 +#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 +#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 #: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 -#: ../../Zotlabs/Module/Filestorage.php:155 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:743 +#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:754 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:61 +#: ../../Zotlabs/Widget/Wiki_pages.php:40 +#: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 -#: ../../addon/mailhost/mailhost.php:40 #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:816 #: ../../addon/gitwiki/Mod_Gitwiki.php:155 -#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170 -#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 +#: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 +#: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 #: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 #: ../../addon/statusnet/statusnet.php:380 #: ../../addon/statusnet/statusnet.php:432 -#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217 +#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:217 #: ../../addon/twitter/twitter.php:259 #: ../../addon/smileybutton/smileybutton.php:219 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 @@ -474,7 +479,24 @@ msgstr "3. Pulse [conectar]" msgid "Submit" msgstr "Enviar" +#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Cards.php:38 +#: ../../Zotlabs/Module/Cards.php:178 ../../Zotlabs/Lib/Apps.php:224 +#: ../../include/conversation.php:1890 ../../include/features.php:122 +#: ../../include/nav.php:490 +msgid "Cards" +msgstr "Fichas" + +#: ../../Zotlabs/Module/Articles.php:95 +msgid "Add Article" +msgstr "Añadir un artículo" + +#: ../../Zotlabs/Module/Articles.php:178 ../../include/nav.php:501 +msgid "Articles" +msgstr "Artículos" + #: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Article_edit.php:17 +#: ../../Zotlabs/Module/Article_edit.php:33 #: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 #: ../../Zotlabs/Module/Editwebpage.php:80 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17 @@ -496,13 +518,14 @@ msgstr "Descripción de la plantilla (opcional)" msgid "Edit Layout" msgstr "Modificar la plantilla" -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 +#: ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Cloud.php:111 ../../Zotlabs/Module/Group.php:74 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 -#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:168 -#: ../../addon/redphotos/redphotos.php:119 +#: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Web/WebServer.php:168 +#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 #: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109 -#: ../../include/items.php:346 +#: ../../include/items.php:358 msgid "Permission denied" msgstr "Permiso denegado" @@ -514,7 +537,7 @@ msgstr "Identificador del perfil no válido" msgid "Profile Visibility Editor" msgstr "Editor de visibilidad del perfil" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1585 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1633 msgid "Profile" msgstr "Perfil" @@ -541,11 +564,11 @@ msgstr "Resumen: " #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:764 ../../Zotlabs/Module/Photos.php:1220 -#: ../../Zotlabs/Lib/Apps.php:727 ../../Zotlabs/Lib/Apps.php:805 -#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:86 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:841 -#: ../../include/conversation.php:1143 +#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 +#: ../../Zotlabs/Lib/Apps.php:744 ../../Zotlabs/Lib/Apps.php:822 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:842 +#: ../../include/conversation.php:1160 msgid "Unknown" msgstr "Desconocido" @@ -582,7 +605,7 @@ msgid "End date and time" msgstr "Fecha y hora de finalización" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 msgid "Description" msgstr "Descripción" @@ -595,20 +618,20 @@ msgid "Location" msgstr "Ubicación" #: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 -#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:337 -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Photos.php:918 +#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 msgid "Previous" msgstr "Anterior" #: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Cal.php:345 -#: ../../Zotlabs/Module/Photos.php:927 +#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 +#: ../../Zotlabs/Module/Photos.php:980 msgid "Next" msgstr "Siguiente" #: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 -#: ../../Zotlabs/Module/Cal.php:346 +#: ../../Zotlabs/Module/Cal.php:348 msgid "Today" msgstr "Hoy" @@ -656,14 +679,13 @@ msgstr "Eliminar todos" #: ../../Zotlabs/Module/Admin/Plugins.php:423 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:333 ../../Zotlabs/Module/Wiki.php:363 +#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375 #: ../../Zotlabs/Module/Connedit.php:942 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 #: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/js_upload/js_upload.php:46 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1369 -#: ../../include/conversation.php:1418 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/gitwiki/Mod_Gitwiki.php:244 +#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386 +#: ../../include/conversation.php:1435 msgid "Cancel" msgstr "Cancelar" @@ -677,8 +699,8 @@ msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementa #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:554 -#: ../../Zotlabs/Storage/Browser.php:234 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:280 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 #: ../../addon/gitwiki/Mod_Gitwiki.php:158 @@ -704,7 +726,7 @@ msgstr "Teléfono" #: ../../Zotlabs/Module/Connedit.php:928 ../../Zotlabs/Module/Profiles.php:790 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1706 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "Correo electrónico" @@ -731,19 +753,19 @@ msgid "Note" msgstr "Nota" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:933 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1290 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1301 #: ../../include/connections.php:682 msgid "Mobile" msgstr "Móvil" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:934 -#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1291 +#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1302 #: ../../include/connections.php:683 msgid "Home" msgstr "Inicio" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:935 -#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1294 +#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1305 #: ../../include/connections.php:686 msgid "Work" msgstr "Trabajo" @@ -886,9 +908,13 @@ msgid "" " please import or restore these in date order (oldest first)." msgstr "Estos ficheros pueden ser importados o restaurados visitando %2$s o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)." -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490 +#: ../../Zotlabs/Module/Hq.php:136 +msgid "Welcome to hubzilla!" +msgstr "¡Bienvenido o bienvenida a Hubzilla!" + +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 -#: ../../Zotlabs/Module/Display.php:21 +#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." msgstr "Acceso público denegado." @@ -896,7 +922,7 @@ msgstr "Acceso público denegado." #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:313 #: ../../Zotlabs/Lib/Apps.php:250 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../include/text.php:1029 ../../include/text.php:1041 -#: ../../include/acl_selectors.php:213 ../../include/nav.php:204 +#: ../../include/acl_selectors.php:213 ../../include/nav.php:211 msgid "Search" msgstr "Buscar" @@ -910,8 +936,8 @@ msgstr "elementos etiquetados con: %s" msgid "Search results for: %s" msgstr "Resultados de la búsqueda para: %s" -#: ../../Zotlabs/Module/Pubstream.php:38 -#: ../../Zotlabs/Widget/Notifications.php:128 +#: ../../Zotlabs/Module/Pubstream.php:81 +#: ../../Zotlabs/Widget/Notifications.php:129 msgid "Public Stream" msgstr "\"Stream\" público" @@ -967,14 +993,23 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio msgid "Use this form to drop the location if the hub is no longer operating." msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo." -#: ../../Zotlabs/Module/Apporder.php:39 -msgid "Change Order of Navigation Apps" -msgstr "Cambiar el orden de las aplicaciones en la barra de navegación" +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of Pinned Navbar Apps" +msgstr "Cambiar el orden de las aplicaciones fijas en la barra de navegación" -#: ../../Zotlabs/Module/Apporder.php:40 +#: ../../Zotlabs/Module/Apporder.php:44 +msgid "Change Order of App Tray Apps" +msgstr "Cambiar el orden de las aplicaciones de la bandeja de aplicaciones" + +#: ../../Zotlabs/Module/Apporder.php:45 msgid "" -"Use arrows to move the corresponding app up or down in the display list" -msgstr "Utilizar las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la lista de visualización" +"Use arrows to move the corresponding app left (top) or right (bottom) in the" +" navbar" +msgstr "Use las flechas para mover la aplicación correspondiente a la izquierda (arriba) o derecha (abajo) en la barra de navegación." + +#: ../../Zotlabs/Module/Apporder.php:45 +msgid "Use arrows to move the corresponding app up or down in the app tray" +msgstr "Use las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la bandeja de aplicaciones." #: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 msgid "Menu not found." @@ -1002,7 +1037,7 @@ msgid "Menu Item Permissions" msgstr "Permisos del elemento del menú" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "(click to open/close)" msgstr "(pulsar para abrir o cerrar)" @@ -1026,17 +1061,17 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:237 -#: ../../Zotlabs/Module/Settings/Channel.php:298 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Admin/Site.php:240 +#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Settings/Display.php:105 +#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 #: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:150 -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1077,16 +1112,17 @@ msgstr "No" #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:239 -#: ../../Zotlabs/Module/Settings/Channel.php:298 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Admin/Site.php:242 +#: ../../Zotlabs/Module/Settings/Channel.php:305 +#: ../../Zotlabs/Module/Settings/Display.php:105 +#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:697 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 #: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:150 -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 ../../boot.php:1644 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1228,9 +1264,9 @@ msgstr "Se requieren el título del evento y su hora de inicio." msgid "Event not found." msgstr "Evento no encontrado." -#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51 -#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119 -#: ../../include/text.php:1941 ../../include/event.php:1145 +#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 +#: ../../Zotlabs/Module/Like.php:384 ../../include/conversation.php:119 +#: ../../include/text.php:1941 ../../include/event.php:1153 msgid "event" msgstr "evento" @@ -1239,9 +1275,9 @@ msgid "Edit event title" msgstr "Editar el título del evento" #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137 +#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141 #: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../include/datetime.php:259 +#: ../../include/datetime.php:265 msgid "Required" msgstr "Obligatorio" @@ -1291,13 +1327,13 @@ msgstr "Editar la descripción" msgid "Edit Location" msgstr "Modificar la dirección" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1070 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:753 -#: ../../include/conversation.php:1313 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:764 +#: ../../include/conversation.php:1330 msgid "Preview" msgstr "Previsualizar" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402 msgid "Permission settings" msgstr "Configuración de permisos" @@ -1309,7 +1345,7 @@ msgstr "Zona horaria: " msgid "Advanced Options" msgstr "Opciones avanzadas" -#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:264 +#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266 msgid "l, F j" msgstr "l j F" @@ -1321,7 +1357,7 @@ msgstr "Editar evento" msgid "Delete event" msgstr "Borrar evento" -#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313 +#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 #: ../../include/text.php:1760 msgid "Link to Source" msgstr "Enlazar con la entrada en su ubicación original" @@ -1330,16 +1366,16 @@ msgstr "Enlazar con la entrada en su ubicación original" msgid "calendar" msgstr "calendario" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 msgid "Edit Event" msgstr "Editar el evento" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336 +#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 msgid "Create Event" msgstr "Crear un evento" -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339 -#: ../../include/channel.php:1588 +#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 +#: ../../include/channel.php:1636 msgid "Export" msgstr "Exportar" @@ -1359,47 +1395,47 @@ msgstr "Aplicación instalada." msgid "Malformed app." msgstr "Aplicación con errores" -#: ../../Zotlabs/Module/Appman.php:125 +#: ../../Zotlabs/Module/Appman.php:129 msgid "Embed code" msgstr "Código incorporado" -#: ../../Zotlabs/Module/Appman.php:131 +#: ../../Zotlabs/Module/Appman.php:135 msgid "Edit App" msgstr "Modificar la aplicación" -#: ../../Zotlabs/Module/Appman.php:131 +#: ../../Zotlabs/Module/Appman.php:135 msgid "Create App" msgstr "Crear una aplicación" -#: ../../Zotlabs/Module/Appman.php:136 +#: ../../Zotlabs/Module/Appman.php:140 msgid "Name of app" msgstr "Nombre de la aplicación" -#: ../../Zotlabs/Module/Appman.php:137 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Location (URL) of app" msgstr "Dirección (URL) de la aplicación" -#: ../../Zotlabs/Module/Appman.php:139 +#: ../../Zotlabs/Module/Appman.php:143 msgid "Photo icon URL" msgstr "Dirección del icono" -#: ../../Zotlabs/Module/Appman.php:139 +#: ../../Zotlabs/Module/Appman.php:143 msgid "80 x 80 pixels - optional" msgstr "80 x 80 pixels - opcional" -#: ../../Zotlabs/Module/Appman.php:140 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Categories (optional, comma separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:145 msgid "Version ID" msgstr "Versión" -#: ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Price of app" msgstr "Precio de la aplicación" -#: ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Location (URL) to purchase app" msgstr "Dirección (URL) donde adquirir la aplicación" @@ -1411,30 +1447,55 @@ msgstr "Por favor, inicie sesión." msgid "Hub not found." msgstr "Servidor no encontrado" -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47 -#: ../../Zotlabs/Module/Like.php:370 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 +#: ../../Zotlabs/Module/Like.php:382 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295 #: ../../include/conversation.php:116 ../../include/text.php:1938 msgid "photo" msgstr "foto" -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370 -#: ../../addon/diaspora/Receiver.php:1424 ../../addon/pubcrawl/as.php:1288 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:382 +#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295 #: ../../include/conversation.php:144 ../../include/text.php:1944 msgid "status" msgstr "el mensaje de estado" -#: ../../Zotlabs/Module/Subthread.php:118 +#: ../../Zotlabs/Module/Subthread.php:142 #, php-format msgid "%1$s is following %2$s's %3$s" msgstr "%1$s está siguiendo %3$s de %2$s" -#: ../../Zotlabs/Module/Subthread.php:120 +#: ../../Zotlabs/Module/Subthread.php:144 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "%1$s ha dejado de seguir %3$s de %2$s" +#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75 +#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Card_edit.php:44 +msgid "Channel not found." +msgstr "Canal no encontrado." + +#: ../../Zotlabs/Module/Article_edit.php:101 +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 +#: ../../include/conversation.php:1278 +msgid "Insert web link" +msgstr "Insertar enlace web" + +#: ../../Zotlabs/Module/Article_edit.php:117 +#: ../../Zotlabs/Module/Editblock.php:129 +#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398 +msgid "Title (optional)" +msgstr "Título (opcional)" + +#: ../../Zotlabs/Module/Article_edit.php:128 +msgid "Edit Article" +msgstr "Editar el artículo" + #: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 msgid "Nothing to import." msgstr "No hay nada para importar." @@ -1480,22 +1541,22 @@ msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "Ha creado %1$.0f de %2$.0f canales permitidos." #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:237 +#: ../../Zotlabs/Module/Register.php:249 msgid "Name or caption" msgstr "Nombre o descripción" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:237 +#: ../../Zotlabs/Module/Register.php:249 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" msgstr "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\"" #: ../../Zotlabs/Module/New_channel.php:136 -#: ../../Zotlabs/Module/Register.php:239 +#: ../../Zotlabs/Module/Register.php:251 msgid "Choose a short nickname" msgstr "Elija un alias corto" #: ../../Zotlabs/Module/New_channel.php:136 -#: ../../Zotlabs/Module/Register.php:239 +#: ../../Zotlabs/Module/Register.php:251 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address " @@ -1503,17 +1564,17 @@ msgid "" msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Select a channel role with your privacy requirements." msgstr "Seleccione un tipo de canal con sus requisitos de privacidad" #: ../../Zotlabs/Module/New_channel.php:137 -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:252 msgid "Read more about roles" msgstr "Leer más sobre los roles" @@ -1575,7 +1636,7 @@ msgid "" msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Remove Channel" msgstr "Eliminar el canal" @@ -1588,12 +1649,12 @@ msgid "NEW" msgstr "NUEVO" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:236 ../../include/text.php:1394 +#: ../../Zotlabs/Storage/Browser.php:282 ../../include/text.php:1394 msgid "Size" msgstr "Tamaño" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:237 +#: ../../Zotlabs/Storage/Browser.php:283 msgid "Last Modified" msgstr "Última modificación" @@ -2181,10 +2242,10 @@ msgstr "Intentar ejecutar este paso de actualización automáticamente" #: ../../Zotlabs/Module/Admin/Plugins.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:33 -#: ../../Zotlabs/Module/Display.php:347 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:408 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 -#: ../../include/items.php:3410 +#: ../../include/items.php:3546 msgid "Item not found." msgstr "Elemento no encontrado." @@ -2215,7 +2276,7 @@ msgstr "Activar" #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Site.php:275 #: ../../Zotlabs/Module/Admin/Security.php:86 #: ../../Zotlabs/Module/Admin.php:136 msgid "Administration" @@ -2234,8 +2295,8 @@ msgstr "Cambiar" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:132 -#: ../../include/nav.php:217 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:139 +#: ../../include/nav.php:224 msgid "Settings" msgstr "Ajustes" @@ -2319,7 +2380,7 @@ msgid "Switch branch" msgstr "Cambiar la rama" #: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:967 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 #: ../../addon/superblock/superblock.php:116 msgid "Remove" msgstr "Eliminar" @@ -2342,7 +2403,7 @@ msgstr[1] "%s cuentas eliminadas" msgid "Account not found" msgstr "Cuenta no encontrada" -#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2357 +#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2456 #, php-format msgid "Account '%s' deleted" msgstr "La cuenta '%s' ha sido eliminada" @@ -2381,7 +2442,7 @@ msgid "No registrations." msgstr "Sin registros." #: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:716 +#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:732 msgid "Approve" msgstr "Aprobar" @@ -2403,7 +2464,7 @@ msgstr "Desbloquear" msgid "ID" msgstr "ID" -#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:288 +#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:284 msgid "All Channels" msgstr "Todos los canales" @@ -2538,7 +2599,7 @@ msgid "Disallow Code" msgstr "No permitir código" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1791 ../../include/nav.php:399 +#: ../../include/conversation.php:1808 ../../include/nav.php:410 msgid "Channel" msgstr "Canal" @@ -2583,394 +2644,412 @@ msgstr "[Experimental]" msgid "[Unsupported]" msgstr "[No soportado]" -#: ../../Zotlabs/Module/Admin/Site.php:144 +#: ../../Zotlabs/Module/Admin/Site.php:147 msgid "Site settings updated." msgstr "Ajustes del sitio actualizados." -#: ../../Zotlabs/Module/Admin/Site.php:170 +#: ../../Zotlabs/Module/Admin/Site.php:173 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2943 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2968 msgid "Default" msgstr "Predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:181 -#: ../../Zotlabs/Module/Settings/Display.php:137 +#: ../../Zotlabs/Module/Admin/Site.php:184 +#: ../../Zotlabs/Module/Settings/Display.php:139 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:188 -#: ../../Zotlabs/Module/Settings/Display.php:151 +#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../Zotlabs/Module/Settings/Display.php:153 msgid "mobile" msgstr "móvil" -#: ../../Zotlabs/Module/Admin/Site.php:190 +#: ../../Zotlabs/Module/Admin/Site.php:193 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:192 +#: ../../Zotlabs/Module/Admin/Site.php:195 msgid "unsupported" msgstr "no soportado" -#: ../../Zotlabs/Module/Admin/Site.php:238 +#: ../../Zotlabs/Module/Admin/Site.php:241 msgid "Yes - with approval" msgstr "Sí - con aprobación" -#: ../../Zotlabs/Module/Admin/Site.php:244 +#: ../../Zotlabs/Module/Admin/Site.php:247 msgid "My site is not a public server" msgstr "Mi sitio no es un servidor público" -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:248 msgid "My site has paid access only" msgstr "Mi sitio es un servicio de pago" -#: ../../Zotlabs/Module/Admin/Site.php:246 +#: ../../Zotlabs/Module/Admin/Site.php:249 msgid "My site has free access only" msgstr "Mi sitio es un servicio gratuito" -#: ../../Zotlabs/Module/Admin/Site.php:247 +#: ../../Zotlabs/Module/Admin/Site.php:250 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago" -#: ../../Zotlabs/Module/Admin/Site.php:258 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "Beginner/Basic" msgstr "Principiante / Básico" -#: ../../Zotlabs/Module/Admin/Site.php:259 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "Novice - not skilled but willing to learn" msgstr "Novato: no cualificado, pero dispuesto a aprender" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:264 msgid "Intermediate - somewhat comfortable" msgstr "Intermedio: bastante cómodo" -#: ../../Zotlabs/Module/Admin/Site.php:261 +#: ../../Zotlabs/Module/Admin/Site.php:265 msgid "Advanced - very comfortable" msgstr "Avanzado: muy cómodo" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:266 msgid "Expert - I can write computer code" msgstr "Experto: puedo escribir código informático" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "Wizard - I probably know more than you do" msgstr "Colaborador: probablemente sé más que tú" -#: ../../Zotlabs/Module/Admin/Site.php:272 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:276 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Sitio" -#: ../../Zotlabs/Module/Admin/Site.php:274 -#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Admin/Site.php:278 +#: ../../Zotlabs/Module/Register.php:263 msgid "Registration" msgstr "Registro" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:279 msgid "File upload" msgstr "Subir fichero" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:280 msgid "Policies" msgstr "Políticas" -#: ../../Zotlabs/Module/Admin/Site.php:277 +#: ../../Zotlabs/Module/Admin/Site.php:281 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Avanzado" -#: ../../Zotlabs/Module/Admin/Site.php:281 -#: ../../addon/statusnet/statusnet.php:890 +#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "Nombre del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "Site default technical skill level" msgstr "Nivel de habilidad técnica predeterminado del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Se utiliza para proporcionar una experiencia a los miembros adaptada a su nivel de comodidad técnica" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Lock the technical skill level setting" msgstr "Bloquear el ajuste del nivel de habilidad técnica" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Members can set their own technical comfort level by default" msgstr "Los miembros pueden configurar su nivel de comodidad técnica por defecto" -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Administrator Information" msgstr "Información del Administrador" -#: ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:293 #: ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Information" msgstr "Información sobre el sitio" -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "System language" msgstr "Idioma del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "System theme" msgstr "Tema gráfico del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - modificar los ajustes del tema" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Mobile system theme" msgstr "Tema del sistema para móviles" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Theme for mobile devices" msgstr "Tema para dispositivos móviles" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Allow Feeds as Connections" msgstr "Permitir contenidos RSS como conexiones" -#: ../../Zotlabs/Module/Admin/Site.php:294 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "(Heavy system resource usage)" msgstr "(Uso intenso de los recursos del sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Maximum image size" msgstr "Tamaño máximo de la imagen" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites." -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Does this site allow new member registration?" msgstr "¿Debe este sitio permitir el registro de nuevos miembros?" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Invitation only" msgstr "Solo con una invitación" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"." -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "Which best describes the types of account offered by this hub?" msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Register text" msgstr "Texto del registro" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Will be displayed prominently on the registration page." msgstr "Se mostrará de forma destacada en la página de registro." -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Site homepage to show visitors (default: login box)" msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero." -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Preserve site homepage URL" msgstr "Preservar la dirección de la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla." -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Accounts abandoned after x days" msgstr "Cuentas abandonadas después de x días" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo." -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Allowed friend domains" msgstr "Dominios amigos permitidos" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio." -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Verify Email Addresses" msgstr "Verificar las direcciones de correo electrónico" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)." -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Force publish" msgstr "Forzar la publicación" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio." -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Import Public Streams" msgstr "Importar contenido público" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas." -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Login on Homepage" msgstr "Iniciar sesión en la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido." -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Enable context help" msgstr "Habilitar la ayuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda." -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Reply-to email address for system generated email." msgstr "Dirección de respuesta para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Sender (From) email address for system generated email." msgstr "Dirección del remitente (From) para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Name of email sender for system generated email." msgstr "Nombre del remitente del correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Directory Server URL" msgstr "URL del servidor de directorio" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Default directory server" msgstr "Servidor de directorio predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Proxy user" msgstr "Usuario del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Proxy URL" msgstr "Dirección del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Network timeout" msgstr "Tiempo de espera de la red" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Delivery interval" msgstr "Intervalo de entrega" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Deliveries per process" msgstr "Intentos de envío por proceso" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:325 +msgid "Queue Threshold" +msgstr "Umbral de la cola de espera" + +#: ../../Zotlabs/Module/Admin/Site.php:325 +msgid "" +"Always defer immediate delivery if queue contains more than this number of " +"entries." +msgstr "Aplazar siempre la entrega inmediata si la cola contiene más de este número de entradas." + +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Poll interval" msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Path to ImageMagick convert program" msgstr "Ruta al programa de conversión de ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "Si está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:328 +msgid "Allow SVG thumbnails in file browser" +msgstr "Permitir miniaturas SVG en el navegador de archivos" + +#: ../../Zotlabs/Module/Admin/Site.php:328 +msgid "WARNING: SVG images may contain malicious code." +msgstr "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso." + +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Maximum Load Average" msgstr "Carga media máxima" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50." -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Expiration period in days for imported (grid/network) content" msgstr "Caducidad del contenido importado de otros sitios (en días)" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "0 for no expiration of imported content" msgstr "0 para que no caduque el contenido importado" @@ -3249,19 +3328,19 @@ msgstr "Nombre de la autorización" #: ../../Zotlabs/Module/Settings/Permcats.php:103 #: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" msgstr "Mis ajustes" #: ../../Zotlabs/Module/Settings/Permcats.php:105 #: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Connedit.php:903 ../../Zotlabs/Module/Defperms.php:248 msgid "inherited" msgstr "heredado" #: ../../Zotlabs/Module/Settings/Permcats.php:108 #: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Defperms.php:253 msgid "Individual Permissions" msgstr "Permisos individuales" @@ -3275,18 +3354,19 @@ msgid "" " settings here." msgstr "Algunos permisos pueden ser heredados de los ajustes de privacidad de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. No puede cambiar estos ajustes aquí." -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 +#: ../../Zotlabs/Module/Settings/Channel.php:64 +#: ../../Zotlabs/Module/Settings/Channel.php:68 +#: ../../Zotlabs/Module/Settings/Channel.php:69 +#: ../../Zotlabs/Module/Settings/Channel.php:72 +#: ../../Zotlabs/Module/Settings/Channel.php:83 #: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:28 -#: ../../include/selectors.php:123 ../../include/channel.php:423 -#: ../../include/channel.php:424 ../../include/channel.php:431 +#: ../../include/selectors.php:123 ../../include/channel.php:437 +#: ../../include/channel.php:438 ../../include/channel.php:445 msgid "Friends" msgstr "Amigos/as" -#: ../../Zotlabs/Module/Settings/Channel.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54 @@ -3295,388 +3375,403 @@ msgstr "Amigos/as" msgid "Settings updated." msgstr "Ajustes actualizados." -#: ../../Zotlabs/Module/Settings/Channel.php:316 +#: ../../Zotlabs/Module/Settings/Channel.php:323 msgid "Nobody except yourself" msgstr "Nadie excepto usted" -#: ../../Zotlabs/Module/Settings/Channel.php:317 +#: ../../Zotlabs/Module/Settings/Channel.php:324 msgid "Only those you specifically allow" msgstr "Solo aquellos a los que usted permita explícitamente" -#: ../../Zotlabs/Module/Settings/Channel.php:318 +#: ../../Zotlabs/Module/Settings/Channel.php:325 msgid "Approved connections" msgstr "Conexiones aprobadas" -#: ../../Zotlabs/Module/Settings/Channel.php:319 +#: ../../Zotlabs/Module/Settings/Channel.php:326 msgid "Any connections" msgstr "Cualquier conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:320 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Anybody on this website" msgstr "Cualquiera en este sitio web" -#: ../../Zotlabs/Module/Settings/Channel.php:321 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Anybody in this network" msgstr "Cualquiera en esta red" -#: ../../Zotlabs/Module/Settings/Channel.php:322 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Anybody authenticated" msgstr "Cualquiera que esté autenticado" -#: ../../Zotlabs/Module/Settings/Channel.php:323 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Anybody on the internet" msgstr "Cualquiera en internet" -#: ../../Zotlabs/Module/Settings/Channel.php:399 +#: ../../Zotlabs/Module/Settings/Channel.php:406 msgid "Publish your default profile in the network directory" msgstr "Publicar su perfil principal en el directorio de la red" -#: ../../Zotlabs/Module/Settings/Channel.php:404 +#: ../../Zotlabs/Module/Settings/Channel.php:411 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?" -#: ../../Zotlabs/Module/Settings/Channel.php:408 -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Settings/Channel.php:413 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "Your channel address is" msgstr "Su dirección de canal es" -#: ../../Zotlabs/Module/Settings/Channel.php:416 +#: ../../Zotlabs/Module/Settings/Channel.php:423 msgid "Your files/photos are accessible via WebDAV at" msgstr "Sus archivos y fotos son accesibles a través de WebDAV en " -#: ../../Zotlabs/Module/Settings/Channel.php:478 +#: ../../Zotlabs/Module/Settings/Channel.php:487 msgid "Channel Settings" msgstr "Ajustes del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:485 +#: ../../Zotlabs/Module/Settings/Channel.php:494 msgid "Basic Settings" msgstr "Configuración básica" -#: ../../Zotlabs/Module/Settings/Channel.php:486 -#: ../../include/channel.php:1473 +#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../include/channel.php:1521 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../Zotlabs/Module/Settings/Channel.php:487 +#: ../../Zotlabs/Module/Settings/Channel.php:496 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "Dirección de correo electrónico:" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:497 msgid "Your Timezone:" msgstr "Su huso horario:" -#: ../../Zotlabs/Module/Settings/Channel.php:489 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Default Post Location:" msgstr "Localización geográfica predeterminada para sus publicaciones:" -#: ../../Zotlabs/Module/Settings/Channel.php:489 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Geographical location to display on your posts" msgstr "Localización geográfica que debe mostrarse en sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:490 +#: ../../Zotlabs/Module/Settings/Channel.php:499 msgid "Use Browser Location:" msgstr "Usar la localización geográfica del navegador:" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Adult Content" msgstr "Contenido solo para adultos" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)" -#: ../../Zotlabs/Module/Settings/Channel.php:494 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Security and Privacy Settings" msgstr "Configuración de seguridad y privacidad" -#: ../../Zotlabs/Module/Settings/Channel.php:496 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Hide my online presence" msgstr "Ocultar mi presencia en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Prevents displaying in your profile that you are online" msgstr "Evitar mostrar en su perfil que está en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Simple Privacy Settings:" msgstr "Configuración de privacidad sencilla:" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Muy Público - extremadamente permisivo (debería ser usado con precaución)" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Típico - por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Private - default private, never open or public" msgstr "Privado - por defecto, privado, nunca abierto o público" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Blocked - default blocked to/from everybody" msgstr "Bloqueado - por defecto, bloqueado/a para cualquiera" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "Allow others to tag your posts" msgstr "Permitir a otros etiquetar sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva." -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Channel Permission Limits" msgstr "Límites de los permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Expire other channel content after this many days" msgstr "Caducar contenido de otros canales después de este número de días" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "0 or blank to use the website limit." msgstr "0 o en blanco para usar el límite del sitio web." -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 #, php-format msgid "This website expires after %d days." msgstr "Este sitio web caduca después de %d días." -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "This website does not expire imported content." msgstr "Este sitio web no caduca el contenido importado." -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "The website limit takes precedence if lower than your limit." msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite." -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Maximum Friend Requests/Day:" msgstr "Máximo de solicitudes de amistad por día:" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "May reduce spam activity" msgstr "Podría reducir la actividad de spam" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Default Privacy Group" msgstr "Grupo de canales predeterminado" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Use my default audience setting for the type of object published" msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:524 +msgid "Profile to assign new connections" +msgstr "Perfil para asignar a las nuevas conexiones" + +#: ../../Zotlabs/Module/Settings/Channel.php:533 msgid "Channel permissions category:" msgstr "Categoría de los permisos del canal:" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Default Permissions Group" msgstr "Grupo de permisos predeterminados" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo de mensajes privados por día de gente desconocida:" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Useful to reduce spamming" msgstr "Útil para reducir el envío de correo no deseado" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Notification Settings" msgstr "Configuración de las notificaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "By default post a status message when:" msgstr "Por defecto, enviar un mensaje de estado cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:545 msgid "accepting a friend request" msgstr "Acepte una solicitud de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "joining a forum/community" msgstr "al unirse a un foro o comunidad" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "making an interesting profile change" msgstr "Realice un cambio interesante en su perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Send a notification email when:" msgstr "Enviar una notificación por correo electrónico cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "You receive a connection request" msgstr "Reciba una solicitud de conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:538 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Your connections are confirmed" msgstr "Sus conexiones hayan sido confirmadas" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Someone writes on your profile wall" msgstr "Alguien escriba en la página de su perfil (\"muro\")" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Someone writes a followup comment" msgstr "Alguien escriba un comentario sobre sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "You receive a private message" msgstr "Reciba un mensaje privado" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "You receive a friend suggestion" msgstr "Reciba una sugerencia de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You are tagged in a post" msgstr "Usted sea etiquetado en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You are poked/prodded/etc. in a post" msgstr "Reciba un toque o incitación en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "Someone likes your post/comment" msgstr "Alguien muestre agrado por su entrada o comentario" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Show visual notifications including:" msgstr "Mostrar notificaciones visuales que incluyan:" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Unseen grid activity" msgstr "Nueva actividad en la red" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Unseen channel activity" msgstr "Actividad no vista en el canal" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen private messages" msgstr "Mensajes privados no leídos" -#: ../../Zotlabs/Module/Settings/Channel.php:553 -#: ../../Zotlabs/Module/Settings/Channel.php:558 -#: ../../Zotlabs/Module/Settings/Channel.php:559 -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomendado" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Upcoming events" msgstr "Próximos eventos" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Events today" msgstr "Eventos de hoy" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming birthdays" msgstr "Próximos cumpleaños" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Not available in all themes" msgstr "No disponible en todos los temas" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "System (personal) notifications" msgstr "Notificaciones del sistema (personales)" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "System info messages" msgstr "Mensajes de información del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System critical alerts" msgstr "Alertas críticas del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "New connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System Registrations" msgstr "Registros del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Unseen shared files" msgstr "Ficheros compartidos no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Unseen public activity" msgstr "Actividad pública no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:576 +msgid "Email notification hub (hostname)" +msgstr "Email de notificación del hub (nombre del host)" + +#: ../../Zotlabs/Module/Settings/Channel.php:576 +#, php-format +msgid "" +"If your channel is mirrored to multiple hubs, set this to your preferred " +"location. This will prevent duplicate email notifications. Example: %s" +msgstr "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s" + +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Notify me of events this many days in advance" msgstr "Avisarme de los eventos con algunos días de antelación" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Must be greater than 0" msgstr "Debe ser mayor que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Advanced Account/Page Type Settings" msgstr "Ajustes avanzados de la cuenta y de los tipos de página" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Change the behaviour of this account for special situations" msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Miscellaneous Settings" msgstr "Ajustes diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Default photo upload folder" msgstr "Carpeta por defecto de las fotos subidas" -#: ../../Zotlabs/Module/Settings/Channel.php:576 -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "%Y - current year, %m - current month" msgstr "%Y - año en curso, %m - mes actual" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Default file upload folder" msgstr "Carpeta por defecto de los ficheros subidos" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Personal menu to display in your channel pages" msgstr "Menú personal que debe mostrarse en las páginas de su canal" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove this channel." msgstr "Eliminar este canal." -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Firefox Share $Projectname provider" msgstr "Servicio de compartición de Firefox: proveedor $Projectname" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Start calendar week on Monday" msgstr "Comenzar el calendario semanal por el lunes" @@ -3830,116 +3925,124 @@ msgstr "Ajustes del controlador de afinidad" msgid "Feature/Addon Settings" msgstr "Ajustes de los complementos" -#: ../../Zotlabs/Module/Settings/Display.php:145 +#: ../../Zotlabs/Module/Settings/Display.php:147 msgid "No special theme for mobile devices" msgstr "Sin tema especial para dispositivos móviles" -#: ../../Zotlabs/Module/Settings/Display.php:148 +#: ../../Zotlabs/Module/Settings/Display.php:150 #, php-format msgid "%s - (Experimental)" msgstr "%s - (Experimental)" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:204 msgid "Display Settings" msgstr "Ajustes de visualización" -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:205 msgid "Theme Settings" msgstr "Ajustes del tema" -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "Custom Theme Settings" msgstr "Ajustes personalizados del tema" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:207 msgid "Content Settings" msgstr "Ajustes del contenido" -#: ../../Zotlabs/Module/Settings/Display.php:211 +#: ../../Zotlabs/Module/Settings/Display.php:213 msgid "Display Theme:" msgstr "Tema gráfico del perfil:" -#: ../../Zotlabs/Module/Settings/Display.php:212 +#: ../../Zotlabs/Module/Settings/Display.php:214 msgid "Select scheme" msgstr "Elegir un esquema" -#: ../../Zotlabs/Module/Settings/Display.php:214 +#: ../../Zotlabs/Module/Settings/Display.php:216 msgid "Mobile Theme:" msgstr "Tema para el móvil:" -#: ../../Zotlabs/Module/Settings/Display.php:215 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "Preload images before rendering the page" msgstr "Carga previa de las imágenes antes de generar la página" -#: ../../Zotlabs/Module/Settings/Display.php:215 +#: ../../Zotlabs/Module/Settings/Display.php:217 msgid "" "The subjective page load time will be longer but the page will be ready when" " displayed" msgstr "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre." -#: ../../Zotlabs/Module/Settings/Display.php:216 +#: ../../Zotlabs/Module/Settings/Display.php:218 msgid "Enable user zoom on mobile devices" msgstr "Habilitar zoom de usuario en dispositivos móviles" -#: ../../Zotlabs/Module/Settings/Display.php:217 +#: ../../Zotlabs/Module/Settings/Display.php:219 msgid "Update browser every xx seconds" msgstr "Actualizar navegador cada xx segundos" -#: ../../Zotlabs/Module/Settings/Display.php:217 +#: ../../Zotlabs/Module/Settings/Display.php:219 msgid "Minimum of 10 seconds, no maximum" msgstr "Mínimo de 10 segundos, sin máximo" -#: ../../Zotlabs/Module/Settings/Display.php:218 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Maximum number of conversations to load at any time:" msgstr "Máximo número de conversaciones a cargar en cualquier momento:" -#: ../../Zotlabs/Module/Settings/Display.php:218 +#: ../../Zotlabs/Module/Settings/Display.php:220 msgid "Maximum of 100 items" msgstr "Máximo de 100 elementos" -#: ../../Zotlabs/Module/Settings/Display.php:219 +#: ../../Zotlabs/Module/Settings/Display.php:221 msgid "Show emoticons (smilies) as images" msgstr "Mostrar emoticonos (smilies) como imágenes" -#: ../../Zotlabs/Module/Settings/Display.php:220 +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "Provide channel menu in navigation bar" +msgstr "Proporcionar un menú de canales en la barra de navegación" + +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "Default: channel menu located in app menu" +msgstr "Predeterminado: menú de canales ubicado en el menú de aplicaciones" + +#: ../../Zotlabs/Module/Settings/Display.php:223 msgid "Manual conversation updates" msgstr "Actualizaciones manuales de la conversación" -#: ../../Zotlabs/Module/Settings/Display.php:220 +#: ../../Zotlabs/Module/Settings/Display.php:223 msgid "Default is on, turning this off may increase screen jumping" msgstr "El valor predeterminado está activado, al desactivarlo puede aumentar el salto de pantalla" -#: ../../Zotlabs/Module/Settings/Display.php:221 +#: ../../Zotlabs/Module/Settings/Display.php:224 msgid "Link post titles to source" msgstr "Enlazar título de la publicación a la fuente original" -#: ../../Zotlabs/Module/Settings/Display.php:222 +#: ../../Zotlabs/Module/Settings/Display.php:225 msgid "System Page Layout Editor - (advanced)" msgstr "Editor de plantilla de página del sistema - (avanzado)" -#: ../../Zotlabs/Module/Settings/Display.php:225 +#: ../../Zotlabs/Module/Settings/Display.php:228 msgid "Use blog/list mode on channel page" msgstr "Usar modo blog/lista en la página de inicio del canal" -#: ../../Zotlabs/Module/Settings/Display.php:225 -#: ../../Zotlabs/Module/Settings/Display.php:226 +#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:229 msgid "(comments displayed separately)" msgstr "(comentarios mostrados de forma separada)" -#: ../../Zotlabs/Module/Settings/Display.php:226 +#: ../../Zotlabs/Module/Settings/Display.php:229 msgid "Use blog/list mode on grid page" msgstr "Mostrar mi red en modo blog" -#: ../../Zotlabs/Module/Settings/Display.php:227 +#: ../../Zotlabs/Module/Settings/Display.php:230 msgid "Channel page max height of content (in pixels)" msgstr "Altura máxima del contenido de la página del canal (en píxeles)" -#: ../../Zotlabs/Module/Settings/Display.php:227 -#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:230 +#: ../../Zotlabs/Module/Settings/Display.php:231 msgid "click to expand content exceeding this height" msgstr "Pulsar para expandir el contenido que exceda de esta altura" -#: ../../Zotlabs/Module/Settings/Display.php:228 +#: ../../Zotlabs/Module/Settings/Display.php:231 msgid "Grid page max height of content (in pixels)" msgstr "Altura máxima del contenido de mi red (en píxeles)" @@ -3963,7 +4066,7 @@ msgstr "Nombre de la aplicación" #: ../../Zotlabs/Module/Settings/Oauth.php:90 #: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:775 +#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:775 msgid "Consumer Key" msgstr "Consumer Key" @@ -3974,7 +4077,7 @@ msgstr "Generado automáticamente - si lo desea, cámbielo. Longitud máxima: 2 #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:892 ../../addon/twitter/twitter.php:776 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:776 msgid "Consumer Secret" msgstr "Consumer Secret" @@ -4020,24 +4123,25 @@ msgid "Remove authorization" msgstr "Eliminar autorización" #: ../../Zotlabs/Module/Embedphotos.php:140 -#: ../../Zotlabs/Module/Photos.php:758 ../../Zotlabs/Module/Photos.php:1297 -#: ../../Zotlabs/Widget/Portfolio.php:78 ../../Zotlabs/Widget/Album.php:78 +#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350 +#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "Ver foto" #: ../../Zotlabs/Module/Embedphotos.php:156 -#: ../../Zotlabs/Module/Photos.php:789 ../../Zotlabs/Widget/Portfolio.php:97 +#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108 #: ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "Editar álbum" #: ../../Zotlabs/Module/Embedphotos.php:158 -#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1328 -#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Photos.php:844 +#: ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:337 -#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 -#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Storage/Browser.php:274 ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169 +#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97 msgid "Upload" msgstr "Subir" @@ -4099,9 +4203,9 @@ msgid "URL for photo of thing (optional)" msgstr "Dirección para la foto o elemento (opcional)" #: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367 -#: ../../Zotlabs/Module/Photos.php:649 ../../Zotlabs/Module/Photos.php:1018 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Filestorage.php:142 +#: ../../Zotlabs/Module/Filestorage.php:147 #: ../../include/acl_selectors.php:218 msgid "Permissions" msgstr "Permisos" @@ -4111,12 +4215,12 @@ msgid "Add Thing to your Profile" msgstr "Añadir alguna cosa a su perfil" #: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:38 +#: ../../Zotlabs/Module/Notifications.php:57 msgid "No more system notifications." msgstr "No hay más notificaciones del sistema" #: ../../Zotlabs/Module/Notify.php:65 -#: ../../Zotlabs/Module/Notifications.php:42 +#: ../../Zotlabs/Module/Notifications.php:61 msgid "System Notifications" msgstr "Notificaciones del sistema" @@ -4134,7 +4238,7 @@ msgid "No channel. Import failed." msgstr "No hay canal. La importación ha fallado" #: ../../Zotlabs/Module/Import.php:481 -#: ../../addon/diaspora/import_diaspora.php:142 +#: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "Importación completada." @@ -4199,30 +4303,24 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví msgid "Authentication failed." msgstr "Falló la autenticación." -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1640 -#: ../../include/channel.php:2204 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1665 +#: ../../include/channel.php:2301 msgid "Remote Authentication" msgstr "Acceso desde su servidor" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2205 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2302 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2206 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2303 msgid "Authenticate" msgstr "Acceder" -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 -#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Card_edit.php:44 -msgid "Channel not found." -msgstr "Canal no encontrado." - #: ../../Zotlabs/Module/Cal.php:69 msgid "Permissions denied." msgstr "Permisos denegados." -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2312 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2312 msgid "Import" msgstr "Importar" @@ -4248,18 +4346,6 @@ msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y con msgid "Item not available." msgstr "Elemento no disponible" -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 -#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1261 -msgid "Insert web link" -msgstr "Insertar enlace web" - -#: ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1381 -msgid "Title (optional)" -msgstr "Título (opcional)" - #: ../../Zotlabs/Module/Editblock.php:138 msgid "Edit Block" msgstr "Modificar este bloque" @@ -4280,7 +4366,7 @@ msgstr "Gestionar las aplicaciones" msgid "Create new app" msgstr "Crear una nueva aplicación" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256 +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268 #, php-format msgctxt "mood" msgid "%1$s is %2$s" @@ -4319,7 +4405,8 @@ msgstr "Archivado o inaccesible" #: ../../Zotlabs/Module/Connections.php:74 #: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1697 +#: ../../Zotlabs/Module/Notifications.php:52 +#: ../../include/conversation.php:1714 msgid "New" msgstr "Nuevas" @@ -4330,7 +4417,7 @@ msgid "All" msgstr "Todos/as" #: ../../Zotlabs/Module/Connections.php:133 -#: ../../Zotlabs/Widget/Notifications.php:80 +#: ../../Zotlabs/Widget/Notifications.php:82 msgid "New Connections" msgstr "Nuevas conexiones" @@ -4421,7 +4508,7 @@ msgid "Recent activity" msgstr "Actividad reciente" #: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/text.php:959 ../../include/nav.php:107 +#: ../../include/text.php:959 ../../include/nav.php:114 msgid "Connections" msgstr "Conexiones" @@ -4434,8 +4521,8 @@ msgid "Connections search" msgstr "Buscar conexiones" #: ../../Zotlabs/Module/Connections.php:316 -#: ../../Zotlabs/Module/Directory.php:391 -#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Directory.php:396 +#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23 msgid "Find" msgstr "Encontrar" @@ -4499,238 +4586,238 @@ msgstr "Álbum no encontrado." msgid "Delete Album" msgstr "Borrar álbum" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1030 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 msgid "Delete Photo" msgstr "Borrar foto" -#: ../../Zotlabs/Module/Photos.php:501 +#: ../../Zotlabs/Module/Photos.php:551 msgid "No photos selected" msgstr "No hay fotos seleccionadas" -#: ../../Zotlabs/Module/Photos.php:550 +#: ../../Zotlabs/Module/Photos.php:600 msgid "Access to this item is restricted." msgstr "El acceso a este elemento está restringido." -#: ../../Zotlabs/Module/Photos.php:593 +#: ../../Zotlabs/Module/Photos.php:646 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:596 +#: ../../Zotlabs/Module/Photos.php:649 #, php-format msgid "%1$.2f MB photo storage used." msgstr "%1$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:638 +#: ../../Zotlabs/Module/Photos.php:691 msgid "Upload Photos" msgstr "Subir fotos" -#: ../../Zotlabs/Module/Photos.php:642 +#: ../../Zotlabs/Module/Photos.php:695 msgid "Enter an album name" msgstr "Introducir un nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:643 +#: ../../Zotlabs/Module/Photos.php:696 msgid "or select an existing album (doubleclick)" msgstr "o seleccionar uno existente (doble click)" -#: ../../Zotlabs/Module/Photos.php:644 +#: ../../Zotlabs/Module/Photos.php:697 msgid "Create a status post for this upload" msgstr "Crear un mensaje de estado para esta subida" -#: ../../Zotlabs/Module/Photos.php:645 +#: ../../Zotlabs/Module/Photos.php:698 msgid "Caption (optional):" msgstr "Título (opcional):" -#: ../../Zotlabs/Module/Photos.php:646 +#: ../../Zotlabs/Module/Photos.php:699 msgid "Description (optional):" msgstr "Descripción (opcional):" -#: ../../Zotlabs/Module/Photos.php:732 +#: ../../Zotlabs/Module/Photos.php:785 msgid "Show Newest First" msgstr "Mostrar lo más reciente primero" -#: ../../Zotlabs/Module/Photos.php:734 +#: ../../Zotlabs/Module/Photos.php:787 msgid "Show Oldest First" msgstr "Mostrar lo más antiguo primero" -#: ../../Zotlabs/Module/Photos.php:839 +#: ../../Zotlabs/Module/Photos.php:892 msgid "Permission denied. Access to this item may be restricted." msgstr "Permiso denegado. El acceso a este elemento puede estar restringido." -#: ../../Zotlabs/Module/Photos.php:841 +#: ../../Zotlabs/Module/Photos.php:894 msgid "Photo not available" msgstr "Foto no disponible" -#: ../../Zotlabs/Module/Photos.php:899 +#: ../../Zotlabs/Module/Photos.php:952 msgid "Use as profile photo" msgstr "Usar como foto del perfil" -#: ../../Zotlabs/Module/Photos.php:900 +#: ../../Zotlabs/Module/Photos.php:953 msgid "Use as cover photo" msgstr "Usar como imagen de portada del perfil" -#: ../../Zotlabs/Module/Photos.php:907 +#: ../../Zotlabs/Module/Photos.php:960 msgid "Private Photo" msgstr "Foto privada" -#: ../../Zotlabs/Module/Photos.php:922 +#: ../../Zotlabs/Module/Photos.php:975 msgid "View Full Size" msgstr "Ver tamaño completo" -#: ../../Zotlabs/Module/Photos.php:1004 +#: ../../Zotlabs/Module/Photos.php:1057 msgid "Edit photo" msgstr "Editar foto" -#: ../../Zotlabs/Module/Photos.php:1006 +#: ../../Zotlabs/Module/Photos.php:1059 msgid "Rotate CW (right)" msgstr "Girar CW (a la derecha)" -#: ../../Zotlabs/Module/Photos.php:1007 +#: ../../Zotlabs/Module/Photos.php:1060 msgid "Rotate CCW (left)" msgstr "Girar CCW (a la izquierda)" -#: ../../Zotlabs/Module/Photos.php:1010 +#: ../../Zotlabs/Module/Photos.php:1063 msgid "Move photo to album" msgstr "Mover la foto a un álbum" -#: ../../Zotlabs/Module/Photos.php:1011 +#: ../../Zotlabs/Module/Photos.php:1064 msgid "Enter a new album name" msgstr "Introducir un nuevo nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:1012 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "or select an existing one (doubleclick)" msgstr "o seleccionar uno (doble click) existente" -#: ../../Zotlabs/Module/Photos.php:1015 +#: ../../Zotlabs/Module/Photos.php:1068 msgid "Caption" msgstr "Título" -#: ../../Zotlabs/Module/Photos.php:1017 +#: ../../Zotlabs/Module/Photos.php:1070 msgid "Add a Tag" msgstr "Añadir una etiqueta" -#: ../../Zotlabs/Module/Photos.php:1025 +#: ../../Zotlabs/Module/Photos.php:1078 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com" -#: ../../Zotlabs/Module/Photos.php:1028 +#: ../../Zotlabs/Module/Photos.php:1081 msgid "Flag as adult in album view" msgstr "Marcar como \"solo para adultos\" en el álbum" -#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Lib/ThreadItem.php:271 +#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 msgid "I like this (toggle)" msgstr "Me gusta (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1048 ../../Zotlabs/Lib/ThreadItem.php:272 +#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1050 ../../Zotlabs/Lib/ThreadItem.php:416 -#: ../../include/conversation.php:768 +#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 +#: ../../include/conversation.php:785 msgid "Please wait" msgstr "Espere por favor" -#: ../../Zotlabs/Module/Photos.php:1066 ../../Zotlabs/Module/Photos.php:1184 -#: ../../Zotlabs/Lib/ThreadItem.php:740 +#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 +#: ../../Zotlabs/Lib/ThreadItem.php:751 msgid "This is you" msgstr "Este es usted" -#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Photos.php:1186 -#: ../../Zotlabs/Lib/ThreadItem.php:742 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 +#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/js_strings.php:6 msgid "Comment" msgstr "Comentar" -#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 msgctxt "title" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1084 ../../include/conversation.php:594 +#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 msgctxt "title" msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Agree" msgstr "De acuerdo" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Disagree" msgstr "En desacuerdo" -#: ../../Zotlabs/Module/Photos.php:1085 ../../include/conversation.php:595 +#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 msgctxt "title" msgid "Abstain" msgstr "Abstención" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Attending" msgstr "Participaré" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Not attending" msgstr "No participaré" -#: ../../Zotlabs/Module/Photos.php:1086 ../../include/conversation.php:596 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 msgctxt "title" msgid "Might attend" msgstr "Quizá participe" -#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Photos.php:1115 -#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Lib/ThreadItem.php:203 +#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 +#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 msgid "View all" msgstr "Ver todo" -#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Lib/ThreadItem.php:195 -#: ../../include/conversation.php:1950 ../../include/channel.php:1491 -#: ../../include/taxonomy.php:520 +#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 +#: ../../include/conversation.php:1978 ../../include/channel.php:1539 +#: ../../include/taxonomy.php:593 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "Me gusta" msgstr[1] "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1112 ../../Zotlabs/Lib/ThreadItem.php:200 -#: ../../include/conversation.php:1953 +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 +#: ../../include/conversation.php:1981 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "No me gusta" msgstr[1] "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Module/Photos.php:1265 msgid "Photo Tools" msgstr "Gestión de las fotos" -#: ../../Zotlabs/Module/Photos.php:1221 +#: ../../Zotlabs/Module/Photos.php:1274 msgid "In This Photo:" msgstr "En esta foto:" -#: ../../Zotlabs/Module/Photos.php:1226 +#: ../../Zotlabs/Module/Photos.php:1279 msgid "Map" msgstr "Mapa" -#: ../../Zotlabs/Module/Photos.php:1234 ../../Zotlabs/Lib/ThreadItem.php:404 +#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 msgctxt "noun" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1235 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 msgctxt "noun" msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1240 ../../Zotlabs/Lib/ThreadItem.php:410 +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 #: ../../include/acl_selectors.php:220 msgid "Close" msgstr "Cerrar" -#: ../../Zotlabs/Module/Photos.php:1312 ../../Zotlabs/Module/Photos.php:1325 -#: ../../Zotlabs/Module/Photos.php:1326 ../../include/photos.php:601 +#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 +#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656 msgid "Recent Photos" msgstr "Fotos recientes" @@ -4738,7 +4825,8 @@ msgstr "Fotos recientes" msgid "Profile Unavailable." msgstr "Perfil no disponible" -#: ../../Zotlabs/Module/Wiki.php:44 ../../addon/gitwiki/Mod_Gitwiki.php:42 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108 +#: ../../addon/gitwiki/Mod_Gitwiki.php:42 msgid "Not found" msgstr "No encontrado" @@ -4759,7 +4847,7 @@ msgid "Error downloading wiki: " msgstr "Error al descargar el wiki: " #: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1897 ../../include/nav.php:504 +#: ../../include/conversation.php:1925 ../../include/nav.php:526 msgid "Wikis" msgstr "Wikis" @@ -4781,22 +4869,25 @@ msgstr "Nombre del wiki" msgid "Content type" msgstr "Tipo de contenido" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 -#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1802 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1802 +#: ../../include/features.php:378 msgid "Markdown" msgstr "Markdown" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:336 -#: ../../Zotlabs/Widget/Wiki_pages.php:57 ../../include/text.php:1800 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1800 msgid "BBcode" msgstr "BBcode" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:57 -#: ../../include/text.php:1803 +#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1803 msgid "Text" msgstr "Texto" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:235 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:281 #: ../../addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" msgstr "Tipo" @@ -4825,127 +4916,127 @@ msgstr "Wiki no encontrado" msgid "Rename page" msgstr "Renombrar la página" -#: ../../Zotlabs/Module/Wiki.php:296 ../../addon/gitwiki/Mod_Gitwiki.php:214 +#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214 msgid "Error retrieving page content" msgstr "Error al recuperar el contenido de la página" -#: ../../Zotlabs/Module/Wiki.php:302 ../../Zotlabs/Module/Wiki.php:304 +#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315 msgid "New page" msgstr "Nueva página" -#: ../../Zotlabs/Module/Wiki.php:331 ../../addon/gitwiki/Mod_Gitwiki.php:242 +#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242 msgid "Revision Comparison" msgstr "Comparación de revisiones" -#: ../../Zotlabs/Module/Wiki.php:332 ../../addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243 msgid "Revert" msgstr "Revertir" -#: ../../Zotlabs/Module/Wiki.php:339 +#: ../../Zotlabs/Module/Wiki.php:351 msgid "Short description of your changes (optional)" msgstr "Breve descripción de sus cambios (opcional)" -#: ../../Zotlabs/Module/Wiki.php:346 ../../addon/gitwiki/Mod_Gitwiki.php:252 +#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252 msgid "Source" msgstr "Fuente" -#: ../../Zotlabs/Module/Wiki.php:356 ../../addon/gitwiki/Mod_Gitwiki.php:260 +#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260 msgid "New page name" msgstr "Nombre de la nueva página" -#: ../../Zotlabs/Module/Wiki.php:361 ../../addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1265 +#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1282 msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" -#: ../../Zotlabs/Module/Wiki.php:362 ../../addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1368 +#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1385 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" -#: ../../Zotlabs/Module/Wiki.php:364 ../../addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1370 ../../include/conversation.php:1417 +#: ../../Zotlabs/Module/Wiki.php:376 ../../addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1387 ../../include/conversation.php:1434 msgid "OK" msgstr "OK" -#: ../../Zotlabs/Module/Wiki.php:365 ../../addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1301 +#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1318 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../Zotlabs/Module/Wiki.php:366 ../../addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1302 +#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1319 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../Zotlabs/Module/Wiki.php:367 ../../addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." -#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1304 +#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1321 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../Zotlabs/Module/Wiki.php:369 ../../addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1305 +#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1322 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../Zotlabs/Module/Wiki.php:370 ../../addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1306 +#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1323 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../Zotlabs/Module/Wiki.php:442 ../../addon/gitwiki/Mod_Gitwiki.php:337 +#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337 msgid "Error creating wiki. Invalid name." msgstr "Error al crear el wiki: el nombre no es válido." -#: ../../Zotlabs/Module/Wiki.php:449 +#: ../../Zotlabs/Module/Wiki.php:465 msgid "A wiki with this name already exists." msgstr "Ya hay un wiki con este nombre." -#: ../../Zotlabs/Module/Wiki.php:462 ../../addon/gitwiki/Mod_Gitwiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348 msgid "Wiki created, but error creating Home page." msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio." -#: ../../Zotlabs/Module/Wiki.php:469 ../../addon/gitwiki/Mod_Gitwiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353 msgid "Error creating wiki" msgstr "Error al crear el wiki" -#: ../../Zotlabs/Module/Wiki.php:492 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Error updating wiki. Invalid name." msgstr "Error al actualizar el wiki. Nombre no válido." -#: ../../Zotlabs/Module/Wiki.php:512 +#: ../../Zotlabs/Module/Wiki.php:528 msgid "Error updating wiki" msgstr "Error al actualizar el wiki" -#: ../../Zotlabs/Module/Wiki.php:527 +#: ../../Zotlabs/Module/Wiki.php:543 msgid "Wiki delete permission denied." msgstr "Se ha denegado el permiso para eliminar el wiki." -#: ../../Zotlabs/Module/Wiki.php:537 +#: ../../Zotlabs/Module/Wiki.php:553 msgid "Error deleting wiki" msgstr "Se ha producido un error al eliminar el wiki" -#: ../../Zotlabs/Module/Wiki.php:565 ../../addon/gitwiki/Mod_Gitwiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400 msgid "New page created" msgstr "Se ha creado la nueva página" -#: ../../Zotlabs/Module/Wiki.php:686 +#: ../../Zotlabs/Module/Wiki.php:707 msgid "Cannot delete Home" msgstr "No se puede eliminar la página principal" -#: ../../Zotlabs/Module/Wiki.php:750 +#: ../../Zotlabs/Module/Wiki.php:771 msgid "Current Revision" msgstr "Revisión actual" -#: ../../Zotlabs/Module/Wiki.php:750 +#: ../../Zotlabs/Module/Wiki.php:771 msgid "Selected Revision" msgstr "Revisión seleccionada" -#: ../../Zotlabs/Module/Wiki.php:800 +#: ../../Zotlabs/Module/Wiki.php:821 msgid "You must be authenticated." msgstr "Debe estar autenticado." @@ -4961,7 +5052,7 @@ msgstr "Plantilla actualizada." msgid "Feature disabled." msgstr "Funcionalidad deshabilitada." -#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:88 +#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90 msgid "Edit System Page Description" msgstr "Editor del Sistema de Descripción de Páginas" @@ -4973,24 +5064,28 @@ msgstr "(modificado)" msgid "Reset" msgstr "Reiniciar" -#: ../../Zotlabs/Module/Pdledit.php:83 +#: ../../Zotlabs/Module/Pdledit.php:85 msgid "Layout not found." msgstr "Plantilla no encontrada" -#: ../../Zotlabs/Module/Pdledit.php:89 +#: ../../Zotlabs/Module/Pdledit.php:91 msgid "Module Name:" msgstr "Nombre del módulo:" -#: ../../Zotlabs/Module/Pdledit.php:90 +#: ../../Zotlabs/Module/Pdledit.php:92 msgid "Layout Help" msgstr "Ayuda para el diseño de plantillas de página" -#: ../../Zotlabs/Module/Pdledit.php:91 +#: ../../Zotlabs/Module/Pdledit.php:93 msgid "Edit another layout" msgstr "Editar otro diseño" +#: ../../Zotlabs/Module/Pdledit.php:94 +msgid "System layout" +msgstr "Diseño del sistema" + #: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1075 +#: ../../include/conversation.php:1092 msgid "Poke" msgstr "Toques y otras cosas" @@ -5024,8 +5119,8 @@ msgid "Image uploaded but image cropping failed." msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " #: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:234 -#: ../../include/photo/photo_driver.php:710 +#: ../../Zotlabs/Module/Profile_photo.php:240 +#: ../../include/photo/photo_driver.php:740 msgid "Profile Photos" msgstr "Fotos del perfil" @@ -5034,80 +5129,80 @@ msgstr "Fotos del perfil" msgid "Image resize failed." msgstr "El ajuste del tamaño de la imagen ha fallado." -#: ../../Zotlabs/Module/Profile_photo.php:204 +#: ../../Zotlabs/Module/Profile_photo.php:210 #: ../../addon/openclipatar/openclipatar.php:298 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente." -#: ../../Zotlabs/Module/Profile_photo.php:211 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:156 +#: ../../Zotlabs/Module/Profile_photo.php:217 +#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 msgid "Unable to process image" msgstr "No ha sido posible procesar la imagen" -#: ../../Zotlabs/Module/Profile_photo.php:246 +#: ../../Zotlabs/Module/Profile_photo.php:252 #: ../../Zotlabs/Module/Cover_photo.php:197 msgid "Image upload failed." msgstr "La carga de la imagen ha fallado." -#: ../../Zotlabs/Module/Profile_photo.php:265 +#: ../../Zotlabs/Module/Profile_photo.php:271 #: ../../Zotlabs/Module/Cover_photo.php:214 msgid "Unable to process image." msgstr "No ha sido posible procesar la imagen." -#: ../../Zotlabs/Module/Profile_photo.php:326 -#: ../../Zotlabs/Module/Profile_photo.php:373 +#: ../../Zotlabs/Module/Profile_photo.php:332 +#: ../../Zotlabs/Module/Profile_photo.php:379 #: ../../Zotlabs/Module/Cover_photo.php:307 #: ../../Zotlabs/Module/Cover_photo.php:322 msgid "Photo not available." msgstr "Foto no disponible." -#: ../../Zotlabs/Module/Profile_photo.php:428 +#: ../../Zotlabs/Module/Profile_photo.php:434 #: ../../Zotlabs/Module/Cover_photo.php:358 msgid "Upload File:" msgstr "Subir fichero:" -#: ../../Zotlabs/Module/Profile_photo.php:429 +#: ../../Zotlabs/Module/Profile_photo.php:435 #: ../../Zotlabs/Module/Cover_photo.php:359 msgid "Select a profile:" msgstr "Seleccionar un perfil:" -#: ../../Zotlabs/Module/Profile_photo.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:436 msgid "Use Photo for Profile" msgstr "Usar la fotografía para el perfil" -#: ../../Zotlabs/Module/Profile_photo.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:436 msgid "Upload Profile Photo" msgstr "Subir foto de perfil" -#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Profile_photo.php:437 #: ../../addon/openclipatar/openclipatar.php:182 #: ../../addon/openclipatar/openclipatar.php:194 msgid "Use" msgstr "Usar" -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "skip this step" msgstr "Omitir este paso" -#: ../../Zotlabs/Module/Profile_photo.php:437 +#: ../../Zotlabs/Module/Profile_photo.php:443 #: ../../Zotlabs/Module/Cover_photo.php:365 msgid "select a photo from your photo albums" msgstr "Seleccione una foto de sus álbumes de fotos" -#: ../../Zotlabs/Module/Profile_photo.php:456 +#: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Cover_photo.php:381 msgid "Crop Image" msgstr "Recortar imagen" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:463 #: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Please adjust the image cropping for optimum viewing." msgstr "Por favor ajuste el recorte de la imagen para una visión óptima." -#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Cover_photo.php:384 msgid "Done Editing" msgstr "Edición completada" @@ -5120,65 +5215,65 @@ msgstr "Ausente" msgid "Online" msgstr "Conectado/a" -#: ../../Zotlabs/Module/Item.php:185 +#: ../../Zotlabs/Module/Item.php:193 msgid "Unable to locate original post." msgstr "No ha sido posible encontrar la entrada original." -#: ../../Zotlabs/Module/Item.php:470 +#: ../../Zotlabs/Module/Item.php:475 msgid "Empty post discarded." msgstr "La entrada vacía ha sido desechada." -#: ../../Zotlabs/Module/Item.php:870 +#: ../../Zotlabs/Module/Item.php:853 msgid "Duplicate post suppressed." msgstr "Se ha suprimido la entrada duplicada." -#: ../../Zotlabs/Module/Item.php:1015 +#: ../../Zotlabs/Module/Item.php:998 msgid "System error. Post not saved." msgstr "Error del sistema. La entrada no se ha podido salvar." -#: ../../Zotlabs/Module/Item.php:1051 +#: ../../Zotlabs/Module/Item.php:1034 msgid "Your comment is awaiting approval." msgstr "Su comentario está pendiente de aprobación." -#: ../../Zotlabs/Module/Item.php:1156 +#: ../../Zotlabs/Module/Item.php:1139 msgid "Unable to obtain post information from database." msgstr "No ha sido posible obtener información de la entrada en la base de datos." -#: ../../Zotlabs/Module/Item.php:1163 +#: ../../Zotlabs/Module/Item.php:1168 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal." -#: ../../Zotlabs/Module/Item.php:1170 +#: ../../Zotlabs/Module/Item.php:1175 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." -#: ../../Zotlabs/Module/Ping.php:318 +#: ../../Zotlabs/Module/Ping.php:311 msgid "sent you a private message" msgstr "le ha enviado un mensaje privado" -#: ../../Zotlabs/Module/Ping.php:369 +#: ../../Zotlabs/Module/Ping.php:360 msgid "added your channel" msgstr "añadió este canal a sus conexiones" -#: ../../Zotlabs/Module/Ping.php:393 +#: ../../Zotlabs/Module/Ping.php:384 msgid "requires approval" msgstr "requiere aprobación" -#: ../../Zotlabs/Module/Ping.php:403 +#: ../../Zotlabs/Module/Ping.php:394 msgid "g A l F d" msgstr "g A l d F" -#: ../../Zotlabs/Module/Ping.php:421 +#: ../../Zotlabs/Module/Ping.php:412 msgid "[today]" msgstr "[hoy]" -#: ../../Zotlabs/Module/Ping.php:430 +#: ../../Zotlabs/Module/Ping.php:421 msgid "posted an event" msgstr "publicó un evento" -#: ../../Zotlabs/Module/Ping.php:463 +#: ../../Zotlabs/Module/Ping.php:454 msgid "shared a file with you" msgstr "compartió un archivo con usted" @@ -5186,14 +5281,14 @@ msgstr "compartió un archivo con usted" msgid "Invalid item." msgstr "Elemento no válido." -#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:120 -#: ../../Zotlabs/Lib/NativeWikiPage.php:515 ../../Zotlabs/Web/Router.php:158 +#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Display.php:133 +#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:168 #: ../../include/help.php:81 msgid "Page not found." msgstr "Página no encontrada." -#: ../../Zotlabs/Module/Page.php:165 +#: ../../Zotlabs/Module/Page.php:173 msgid "" "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam," @@ -5203,7 +5298,7 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -#: ../../Zotlabs/Module/Connedit.php:79 +#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59 msgid "Could not access contact record." msgstr "No se ha podido acceder al registro de contacto." @@ -5243,7 +5338,7 @@ msgstr "La conexión ha sido eliminada." #: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:241 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1015 ../../include/nav.php:141 +#: ../../include/conversation.php:1032 ../../include/nav.php:148 msgid "View Profile" msgstr "Ver el perfil" @@ -5411,17 +5506,17 @@ msgid "" "not supported by their network." msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red." -#: ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Defperms.php:238 #: ../../Zotlabs/Widget/Settings_menu.php:109 msgid "Connection Default Permissions" msgstr "Permisos predeterminados de conexión" -#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:3974 +#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4134 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Connedit.php:868 ../../Zotlabs/Module/Defperms.php:239 msgid "Apply these permissions automatically" msgstr "Aplicar estos permisos automaticamente" @@ -5429,11 +5524,11 @@ msgstr "Aplicar estos permisos automaticamente" msgid "Connection requests will be approved without your interaction" msgstr "Las solicitudes de conexión serán aprobadas sin su intervención" -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Defperms.php:240 msgid "Permission role" msgstr "Rol de acceso" -#: ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Defperms.php:241 msgid "Add permission role" msgstr "Añadir un rol de acceso" @@ -5445,7 +5540,7 @@ msgstr "La dirección primaria de esta conexión es" msgid "Available locations:" msgstr "Ubicaciones disponibles:" -#: ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Defperms.php:245 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -5546,13 +5641,13 @@ msgid "Bookmark this room" msgstr "Añadir esta sala a Marcadores" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1296 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313 msgid "Please enter a link URL:" msgstr "Por favor, introduzca la dirección del enlace:" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:757 -#: ../../include/conversation.php:1415 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:768 +#: ../../include/conversation.php:1432 msgid "Encrypt text" msgstr "Cifrar texto" @@ -5586,13 +5681,13 @@ msgid "min" msgstr "min" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:242 -#: ../../include/conversation.php:1814 ../../include/nav.php:422 +#: ../../include/conversation.php:1831 ../../include/nav.php:433 msgid "Photos" msgstr "Fotos" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237 -#: ../../Zotlabs/Storage/Browser.php:225 ../../include/conversation.php:1822 -#: ../../include/nav.php:430 +#: ../../Zotlabs/Storage/Browser.php:269 ../../include/conversation.php:1839 +#: ../../include/nav.php:441 msgid "Files" msgstr "Ficheros" @@ -5689,7 +5784,7 @@ msgid "Layouts" msgstr "Plantillas" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:245 -#: ../../include/nav.php:201 ../../include/nav.php:301 +#: ../../include/nav.php:208 ../../include/nav.php:312 #: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "Ayuda" @@ -5706,17 +5801,25 @@ msgstr "Descripción de la plantilla" msgid "Download PDL file" msgstr "Descargar el fichero PDL" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/markdown.php:141 -#: ../../include/bbcode.php:333 +#: ../../Zotlabs/Module/Cloud.php:114 +msgid "Unknown error" +msgstr "Error desconocido" + +#: ../../Zotlabs/Module/Tagger.php:48 +msgid "Post not found." +msgstr "Mensaje no encontrado." + +#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 +#: ../../include/bbcode.php:335 msgid "post" msgstr "la entrada" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 +#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 #: ../../include/text.php:1946 msgid "comment" msgstr "el comentario" -#: ../../Zotlabs/Module/Tagger.php:95 +#: ../../Zotlabs/Module/Tagger.php:117 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s ha etiquetado %3$s de %2$s con %4$s" @@ -5736,6 +5839,21 @@ msgid "" " to correctly use this feature." msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica." +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención." + +#: ../../Zotlabs/Module/Defperms.php:246 +msgid "Automatic approval settings" +msgstr "Opciones de autorización automática" + +#: ../../Zotlabs/Module/Defperms.php:254 +msgid "" +"Some individual permissions may have been preset or locked based on your " +"channel type and privacy settings." +msgstr "Es posible que se hayan preestablecido o bloqueado algunos permisos individuales según el tipo de canal y la configuración de privacidad." + #: ../../Zotlabs/Module/Group.php:24 msgid "Privacy group created." msgstr "El grupo de canales ha sido creado." @@ -5745,7 +5863,7 @@ msgid "Could not create privacy group." msgstr "No se puede crear el grupo de canales" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:3941 +#: ../../include/items.php:4101 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." @@ -5880,7 +5998,7 @@ msgid "View this profile" msgstr "Ver este perfil" #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1284 +#: ../../include/channel.php:1320 msgid "Edit visibility" msgstr "Editar visibilidad" @@ -5892,7 +6010,7 @@ msgstr "Gestión del perfil" msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1255 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290 msgid "Change profile photo" msgstr "Cambiar la foto del perfil" @@ -5912,7 +6030,7 @@ msgstr "Eliminar este perfil" msgid "Add profile things" msgstr "Añadir cosas al perfil" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1688 +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705 msgid "Personal" msgstr "Personales" @@ -5920,7 +6038,7 @@ msgstr "Personales" msgid "Relation" msgstr "Relación" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55 +#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "Varios" @@ -6057,12 +6175,12 @@ msgstr "Mis otros canales" msgid "Communications" msgstr "Comunicaciones" -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1280 +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316 msgid "Profile Image" msgstr "Imagen del perfil" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1262 -#: ../../include/nav.php:144 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297 +#: ../../include/nav.php:151 msgid "Edit Profiles" msgstr "Editar perfiles" @@ -6079,7 +6197,7 @@ msgid "Create a new channel" msgstr "Crear un nuevo canal" #: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234 -#: ../../include/nav.php:129 ../../include/nav.php:215 +#: ../../include/nav.php:136 ../../include/nav.php:222 msgid "Channel Manager" msgstr "Administración de canales" @@ -6113,12 +6231,6 @@ msgstr "%d nuevas solicitudes de conexión" msgid "Delegated Channel" msgstr "Canal delegado" -#: ../../Zotlabs/Module/Cards.php:38 ../../Zotlabs/Module/Cards.php:178 -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1873 -#: ../../include/features.php:122 ../../include/nav.php:479 -msgid "Cards" -msgstr "Fichas" - #: ../../Zotlabs/Module/Cards.php:95 msgid "Add Card" msgstr "Añadir una ficha" @@ -6139,7 +6251,7 @@ msgstr "Nombre del sitio" msgid "Administrator" msgstr "Administrador" -#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:221 +#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:229 msgid "Terms of Service" msgstr "Términos del servicio" @@ -6174,7 +6286,7 @@ msgid "No ratings" msgstr "Ninguna valoración" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1065 +#: ../../include/conversation.php:1082 msgid "Ratings" msgstr "Valoraciones" @@ -6207,7 +6319,7 @@ msgid "Export selected" msgstr "Exportar los elementos seleccionados" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:238 -#: ../../include/conversation.php:1884 ../../include/nav.php:491 +#: ../../include/conversation.php:1912 ../../include/nav.php:513 msgid "Webpages" msgstr "Páginas web" @@ -6249,13 +6361,13 @@ msgid "" " password." msgstr "Los cambios en el nombre de un canal no está permitida hasta pasadas 48 horas desde el cambio de contraseña de la cuenta." -#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:209 -#: ../../include/channel.php:579 +#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 +#: ../../include/channel.php:599 msgid "Reserved nickname. Please choose another." msgstr "Sobrenombre en uso. Por favor, elija otro." -#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:214 -#: ../../include/channel.php:584 +#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219 +#: ../../include/channel.php:604 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio." @@ -6341,7 +6453,8 @@ msgstr "correo enviado" msgid "Delivery report for %1$s" msgstr "Informe de entrega para %1$s" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:60 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Options" msgstr "Opciones" @@ -6366,7 +6479,7 @@ msgid "*" msgstr "*" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:218 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:228 msgid "Channel Sources" msgstr "Orígenes de los contenidos del canal" @@ -6422,200 +6535,200 @@ msgstr "Fuente eliminada" msgid "Unable to remove source." msgstr "No se puede eliminar la fuente." -#: ../../Zotlabs/Module/Like.php:19 +#: ../../Zotlabs/Module/Like.php:22 msgid "Like/Dislike" msgstr "Me gusta/No me gusta" -#: ../../Zotlabs/Module/Like.php:24 +#: ../../Zotlabs/Module/Like.php:27 msgid "This action is restricted to members." msgstr "Esta acción está restringida solo para miembros." -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Like.php:28 msgid "" "Please login with your $Projectname ID or register as a new $Projectname member to continue." msgstr "Por favor, identifíquese con su $Projectname ID o rregístrese como un nuevo $Projectname member para continuar." -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 +#: ../../Zotlabs/Module/Like.php:108 ../../Zotlabs/Module/Like.php:134 +#: ../../Zotlabs/Module/Like.php:172 msgid "Invalid request." msgstr "Solicitud incorrecta." -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122 +#: ../../Zotlabs/Module/Like.php:120 ../../include/conversation.php:122 msgid "channel" msgstr "el canal" -#: ../../Zotlabs/Module/Like.php:146 +#: ../../Zotlabs/Module/Like.php:149 msgid "thing" msgstr "elemento" -#: ../../Zotlabs/Module/Like.php:192 +#: ../../Zotlabs/Module/Like.php:195 msgid "Channel unavailable." msgstr "Canal no disponible." -#: ../../Zotlabs/Module/Like.php:240 +#: ../../Zotlabs/Module/Like.php:243 msgid "Previous action reversed." msgstr "Acción anterior revocada." -#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/Receiver.php:1453 -#: ../../addon/pubcrawl/as.php:1323 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:435 ../../addon/diaspora/Receiver.php:1462 +#: ../../addon/pubcrawl/as.php:1330 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:425 ../../addon/pubcrawl/as.php:1325 +#: ../../Zotlabs/Module/Like.php:437 ../../addon/pubcrawl/as.php:1332 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:427 +#: ../../Zotlabs/Module/Like.php:439 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s está de acuerdo" -#: ../../Zotlabs/Module/Like.php:429 +#: ../../Zotlabs/Module/Like.php:441 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no está de acuerdo" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Like.php:443 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%3$s de %2$s: %1$s se abstiene" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Like.php:445 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s participa" -#: ../../Zotlabs/Module/Like.php:435 +#: ../../Zotlabs/Module/Like.php:447 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no participa" -#: ../../Zotlabs/Module/Like.php:437 +#: ../../Zotlabs/Module/Like.php:449 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" -#: ../../Zotlabs/Module/Like.php:547 +#: ../../Zotlabs/Module/Like.php:561 msgid "Action completed." msgstr "Acción completada." -#: ../../Zotlabs/Module/Like.php:548 +#: ../../Zotlabs/Module/Like.php:562 msgid "Thank you." msgstr "Gracias." -#: ../../Zotlabs/Module/Directory.php:245 +#: ../../Zotlabs/Module/Directory.php:250 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "%d valoración" msgstr[1] "%d valoraciones" -#: ../../Zotlabs/Module/Directory.php:256 +#: ../../Zotlabs/Module/Directory.php:261 msgid "Gender: " msgstr "Género:" -#: ../../Zotlabs/Module/Directory.php:258 +#: ../../Zotlabs/Module/Directory.php:263 msgid "Status: " msgstr "Estado:" -#: ../../Zotlabs/Module/Directory.php:260 +#: ../../Zotlabs/Module/Directory.php:265 msgid "Homepage: " msgstr "Página personal:" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1516 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1564 msgid "Age:" msgstr "Edad:" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1352 -#: ../../include/event.php:52 ../../include/event.php:84 +#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392 +#: ../../include/event.php:53 ../../include/event.php:85 msgid "Location:" msgstr "Ubicación:" -#: ../../Zotlabs/Module/Directory.php:320 +#: ../../Zotlabs/Module/Directory.php:325 msgid "Description:" msgstr "Descripción:" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1532 +#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1580 msgid "Hometown:" msgstr "Lugar de nacimiento:" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1540 +#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1588 msgid "About:" msgstr "Sobre mí:" -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1035 ../../include/channel.php:1337 +#: ../../include/conversation.php:1052 ../../include/channel.php:1377 #: ../../include/connections.php:111 msgid "Connect" msgstr "Conectar" -#: ../../Zotlabs/Module/Directory.php:329 +#: ../../Zotlabs/Module/Directory.php:334 msgid "Public Forum:" msgstr "Foro público:" -#: ../../Zotlabs/Module/Directory.php:332 +#: ../../Zotlabs/Module/Directory.php:337 msgid "Keywords: " msgstr "Palabras clave:" -#: ../../Zotlabs/Module/Directory.php:335 +#: ../../Zotlabs/Module/Directory.php:340 msgid "Don't suggest" msgstr "No sugerir:" -#: ../../Zotlabs/Module/Directory.php:337 -msgid "Common connections:" -msgstr "Conexiones comunes:" +#: ../../Zotlabs/Module/Directory.php:342 +msgid "Common connections (estimated):" +msgstr "Conexiones comunes (estimadas): " -#: ../../Zotlabs/Module/Directory.php:386 +#: ../../Zotlabs/Module/Directory.php:391 msgid "Global Directory" msgstr "Directorio global:" -#: ../../Zotlabs/Module/Directory.php:386 +#: ../../Zotlabs/Module/Directory.php:391 msgid "Local Directory" msgstr "Directorio local:" -#: ../../Zotlabs/Module/Directory.php:392 +#: ../../Zotlabs/Module/Directory.php:397 msgid "Finding:" msgstr "Encontrar:" -#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "Sugerencias de canales" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "next page" msgstr "siguiente página" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:402 msgid "previous page" msgstr "página anterior" -#: ../../Zotlabs/Module/Directory.php:398 +#: ../../Zotlabs/Module/Directory.php:403 msgid "Sort options" msgstr "Ordenar opciones" -#: ../../Zotlabs/Module/Directory.php:399 +#: ../../Zotlabs/Module/Directory.php:404 msgid "Alphabetic" msgstr "Alfabético" -#: ../../Zotlabs/Module/Directory.php:400 +#: ../../Zotlabs/Module/Directory.php:405 msgid "Reverse Alphabetic" msgstr "Alfabético inverso" -#: ../../Zotlabs/Module/Directory.php:401 +#: ../../Zotlabs/Module/Directory.php:406 msgid "Newest to Oldest" msgstr "De más nuevo a más antiguo" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:407 msgid "Oldest to Newest" msgstr "De más antiguo a más nuevo" -#: ../../Zotlabs/Module/Directory.php:419 +#: ../../Zotlabs/Module/Directory.php:424 msgid "No entries (some entries may be hidden)." msgstr "Sin entradas (algunas entradas pueden estar ocultas)." @@ -6698,7 +6811,7 @@ msgid "Subject:" msgstr "Asunto:" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1365 +#: ../../include/conversation.php:1382 msgid "Attach file" msgstr "Adjuntar fichero" @@ -6707,7 +6820,7 @@ msgid "Send" msgstr "Enviar" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1410 +#: ../../include/conversation.php:1427 msgid "Set expiration date" msgstr "Configurar fecha de caducidad" @@ -6783,28 +6896,28 @@ msgstr "Software" msgid "Rate" msgstr "Valorar" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:263 msgid "webpage" msgstr "página web" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:269 msgid "block" msgstr "bloque" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:266 msgid "layout" msgstr "plantilla" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:272 msgid "menu" msgstr "menú" -#: ../../Zotlabs/Module/Impel.php:181 +#: ../../Zotlabs/Module/Impel.php:183 #, php-format msgid "%s element installed" msgstr "%s elemento instalado" -#: ../../Zotlabs/Module/Impel.php:184 +#: ../../Zotlabs/Module/Impel.php:186 #, php-format msgid "%s element installation failed" msgstr "Elemento con instalación fallida: %s" @@ -6833,7 +6946,7 @@ msgstr "Escriba un nombre de carpeta" msgid "or select an existing folder (doubleclick)" msgstr "o seleccione una (con un doble click)" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:141 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 msgid "Save to Folder" msgstr "Guardar en carpeta" @@ -6855,82 +6968,86 @@ msgstr "Por favor, confirme que acepta los Términos del servicio. El registro h msgid "Passwords do not match." msgstr "Las contraseñas no coinciden." -#: ../../Zotlabs/Module/Register.php:131 +#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137 msgid "" "Registration successful. Please check your email for validation " "instructions." msgstr "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo." -#: ../../Zotlabs/Module/Register.php:137 +#: ../../Zotlabs/Module/Register.php:135 +msgid "Registration successful. Continue to create your first channel..." +msgstr "Registro exitoso. Continúe creando tu primer canal..." + +#: ../../Zotlabs/Module/Register.php:144 msgid "Your registration is pending approval by the site owner." msgstr "Su registro está pendiente de aprobación por el propietario del sitio." -#: ../../Zotlabs/Module/Register.php:140 +#: ../../Zotlabs/Module/Register.php:147 msgid "Your registration can not be processed." msgstr "Su registro no puede ser procesado." -#: ../../Zotlabs/Module/Register.php:184 +#: ../../Zotlabs/Module/Register.php:192 msgid "Registration on this hub is disabled." msgstr "El registro está deshabilitado en este sitio." -#: ../../Zotlabs/Module/Register.php:193 +#: ../../Zotlabs/Module/Register.php:201 msgid "Registration on this hub is by approval only." msgstr "El registro en este hub está sometido a aprobación previa." -#: ../../Zotlabs/Module/Register.php:194 +#: ../../Zotlabs/Module/Register.php:202 msgid "Register at another affiliated hub." msgstr "Registrarse en otro hub afiliado." -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Register.php:212 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana." -#: ../../Zotlabs/Module/Register.php:227 +#: ../../Zotlabs/Module/Register.php:235 #, php-format msgid "I accept the %s for this website" msgstr "Acepto los %s de este sitio" -#: ../../Zotlabs/Module/Register.php:229 +#: ../../Zotlabs/Module/Register.php:241 #, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Tengo más de 13 años de edad y acepto los %s de este sitio" +msgid "I am over %s years of age and accept the %s for this website" +msgstr "Tengo más de %s años de edad y acepto los %s de este sitio web" -#: ../../Zotlabs/Module/Register.php:233 +#: ../../Zotlabs/Module/Register.php:245 msgid "Your email address" msgstr "Su dirección de correo electrónico" -#: ../../Zotlabs/Module/Register.php:234 +#: ../../Zotlabs/Module/Register.php:246 msgid "Choose a password" msgstr "Elija una contraseña" -#: ../../Zotlabs/Module/Register.php:235 +#: ../../Zotlabs/Module/Register.php:247 msgid "Please re-enter your password" msgstr "Por favor, vuelva a escribir su contraseña" -#: ../../Zotlabs/Module/Register.php:236 +#: ../../Zotlabs/Module/Register.php:248 msgid "Please enter your invitation code" msgstr "Por favor, introduzca el código de su invitación" -#: ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Register.php:253 msgid "no" msgstr "no" -#: ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Register.php:253 msgid "yes" msgstr "sí" -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:268 msgid "Membership on this site is by invitation only." msgstr "Para registrarse en este sitio es necesaria una invitación." -#: ../../Zotlabs/Module/Register.php:268 ../../boot.php:1620 -#: ../../include/nav.php:189 +#: ../../Zotlabs/Module/Register.php:280 ../../boot.php:1645 +#: ../../include/nav.php:196 msgid "Register" msgstr "Registrarse" -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/Register.php:281 msgid "" "This site may require email verification after submitting this form. If you " "are returned to a login page, please check your email for instructions." @@ -6941,30 +7058,30 @@ msgstr "Este sitio puede requerir una verificación de correo electrónico despu msgid "Cover Photos" msgstr "Imágenes de portada del perfil" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4320 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4478 msgid "female" msgstr "mujer" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4321 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4479 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4322 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4480 msgid "male" msgstr "hombre" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4323 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4481 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4325 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4483 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1980 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2053 msgid "cover photo" msgstr "Imagen de portada del perfil" @@ -6976,8 +7093,8 @@ msgstr "Subir imagen de portada del perfil" msgid "Documentation Search" msgstr "Búsqueda de Documentación" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1804 -#: ../../include/nav.php:412 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821 +#: ../../include/nav.php:423 msgid "About" msgstr "Mi perfil" @@ -7001,7 +7118,11 @@ msgstr "Documentación de $Projectname" msgid "Contents" msgstr "Contenidos" -#: ../../Zotlabs/Module/Display.php:340 +#: ../../Zotlabs/Module/Display.php:349 +msgid "Article" +msgstr "Artículo" + +#: ../../Zotlabs/Module/Display.php:401 msgid "Item has been removed." msgstr "Se ha eliminado el elemento." @@ -7021,35 +7142,35 @@ msgstr "Seleccionar una etiqueta para eliminar:" msgid "No such group" msgstr "No se encuentra el grupo" -#: ../../Zotlabs/Module/Network.php:136 +#: ../../Zotlabs/Module/Network.php:137 msgid "No such channel" msgstr "No se encuentra el canal" -#: ../../Zotlabs/Module/Network.php:141 +#: ../../Zotlabs/Module/Network.php:142 msgid "forum" msgstr "foro" -#: ../../Zotlabs/Module/Network.php:153 +#: ../../Zotlabs/Module/Network.php:154 msgid "Search Results For:" msgstr "Buscar resultados para:" -#: ../../Zotlabs/Module/Network.php:221 +#: ../../Zotlabs/Module/Network.php:222 msgid "Privacy group is empty" msgstr "El grupo de canales está vacío" -#: ../../Zotlabs/Module/Network.php:230 +#: ../../Zotlabs/Module/Network.php:231 msgid "Privacy group: " msgstr "Grupo de canales: " -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:257 msgid "Invalid connection." msgstr "Conexión no válida." -#: ../../Zotlabs/Module/Network.php:275 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:276 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "El canal no es válido." -#: ../../Zotlabs/Module/Acl.php:351 +#: ../../Zotlabs/Module/Acl.php:358 msgid "network" msgstr "red" @@ -7071,40 +7192,40 @@ msgstr "Permiso denegado" msgid "File not found." msgstr "Fichero no encontrado." -#: ../../Zotlabs/Module/Filestorage.php:137 +#: ../../Zotlabs/Module/Filestorage.php:142 msgid "Edit file permissions" msgstr "Modificar los permisos del fichero" -#: ../../Zotlabs/Module/Filestorage.php:149 +#: ../../Zotlabs/Module/Filestorage.php:154 msgid "Set/edit permissions" msgstr "Establecer/editar los permisos" -#: ../../Zotlabs/Module/Filestorage.php:150 +#: ../../Zotlabs/Module/Filestorage.php:155 msgid "Include all files and sub folders" msgstr "Incluir todos los ficheros y subcarpetas" -#: ../../Zotlabs/Module/Filestorage.php:151 +#: ../../Zotlabs/Module/Filestorage.php:156 msgid "Return to file list" msgstr "Volver a la lista de ficheros" -#: ../../Zotlabs/Module/Filestorage.php:153 +#: ../../Zotlabs/Module/Filestorage.php:158 msgid "Copy/paste this code to attach file to a post" msgstr "Copiar/pegar este código para adjuntar el fichero al envío" -#: ../../Zotlabs/Module/Filestorage.php:154 +#: ../../Zotlabs/Module/Filestorage.php:159 msgid "Copy/paste this URL to link file from a web page" msgstr "Copiar/pegar esta dirección para enlazar el fichero desde una página web" -#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:161 msgid "Share this file" msgstr "Compartir este fichero" -#: ../../Zotlabs/Module/Filestorage.php:157 +#: ../../Zotlabs/Module/Filestorage.php:162 msgid "Show URL to this file" msgstr "Mostrar la dirección de este fichero" -#: ../../Zotlabs/Module/Filestorage.php:158 -#: ../../Zotlabs/Storage/Browser.php:351 +#: ../../Zotlabs/Module/Filestorage.php:163 +#: ../../Zotlabs/Storage/Browser.php:394 msgid "Show in your contacts shared folder" msgstr "Mostrar en la carpeta compartida con sus contactos" @@ -7238,7 +7359,7 @@ msgid "" "Password reset failed." msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1648 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1673 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -7283,8 +7404,8 @@ msgstr "Introduzca y envíe su dirección de correo electrónico para el restabl msgid "Email Address" msgstr "Dirección de correo electrónico" -#: ../../Zotlabs/Module/Notifications.php:43 -#: ../../Zotlabs/Lib/ThreadItem.php:397 +#: ../../Zotlabs/Module/Notifications.php:62 +#: ../../Zotlabs/Lib/ThreadItem.php:408 msgid "Mark all seen" msgstr "Marcar todo como visto" @@ -7336,31 +7457,30 @@ msgstr "Servicio de compartición de Firefox" msgid "Remote Diagnostics" msgstr "Diagnóstico remoto" -#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:342 +#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:352 msgid "Suggest Channels" msgstr "Sugerir canales" -#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1639 -#: ../../include/nav.php:153 ../../include/nav.php:157 +#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1664 +#: ../../include/nav.php:160 ../../include/nav.php:164 msgid "Login" msgstr "Iniciar sesión" -#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:98 +#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:105 msgid "Activity" msgstr "Actividad" -#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1900 -#: ../../include/features.php:95 ../../include/nav.php:507 +#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1928 +#: ../../include/features.php:95 ../../include/nav.php:529 msgid "Wiki" msgstr "Wiki" -#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:102 +#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:109 msgid "Channel Home" msgstr "Mi canal" -#: ../../Zotlabs/Lib/Apps.php:243 ../../include/conversation.php:1833 -#: ../../include/conversation.php:1836 ../../include/nav.php:124 -#: ../../include/nav.php:441 ../../include/nav.php:444 +#: ../../Zotlabs/Lib/Apps.php:243 ../../include/conversation.php:1850 +#: ../../include/conversation.php:1853 ../../include/nav.php:131 msgid "Events" msgstr "Eventos" @@ -7368,7 +7488,7 @@ msgstr "Eventos" msgid "Directory" msgstr "Directorio" -#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:116 +#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:123 msgid "Mail" msgstr "Correo" @@ -7418,14 +7538,22 @@ msgstr "Comprar" msgid "Undelete" msgstr "Recuperar" -#: ../../Zotlabs/Lib/Apps.php:407 +#: ../../Zotlabs/Lib/Apps.php:409 msgid "Add to app-tray" msgstr "Añadir a la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:408 +#: ../../Zotlabs/Lib/Apps.php:410 msgid "Remove from app-tray" msgstr "Quitar de la bandeja de aplicaciones" +#: ../../Zotlabs/Lib/Apps.php:411 +msgid "Pin to navbar" +msgstr "Fijar en la barra de navegación" + +#: ../../Zotlabs/Lib/Apps.php:412 +msgid "Unpin from navbar" +msgstr "Quitar de la barra de navegación" + #: ../../Zotlabs/Lib/Permcat.php:58 msgctxt "permcat" msgid "default" @@ -7447,71 +7575,71 @@ msgid "publisher" msgstr "editor" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:90 +#: ../../Zotlabs/Lib/NativeWikiPage.php:93 msgid "(No Title)" msgstr "(Sin título)" -#: ../../Zotlabs/Lib/NativeWikiPage.php:104 +#: ../../Zotlabs/Lib/NativeWikiPage.php:107 msgid "Wiki page create failed." msgstr "Se ha producido un error en la creación de la página wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:117 +#: ../../Zotlabs/Lib/NativeWikiPage.php:120 msgid "Wiki not found." msgstr "No se ha encontrado el wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:128 +#: ../../Zotlabs/Lib/NativeWikiPage.php:131 msgid "Destination name already exists" msgstr "El nombre de destino ya existe" -#: ../../Zotlabs/Lib/NativeWikiPage.php:160 -#: ../../Zotlabs/Lib/NativeWikiPage.php:355 +#: ../../Zotlabs/Lib/NativeWikiPage.php:163 +#: ../../Zotlabs/Lib/NativeWikiPage.php:359 msgid "Page not found" msgstr "No se ha encontrado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:191 +#: ../../Zotlabs/Lib/NativeWikiPage.php:194 msgid "Error reading page content" msgstr "Se ha producido un error al leer el contenido de la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:347 -#: ../../Zotlabs/Lib/NativeWikiPage.php:396 -#: ../../Zotlabs/Lib/NativeWikiPage.php:463 -#: ../../Zotlabs/Lib/NativeWikiPage.php:504 +#: ../../Zotlabs/Lib/NativeWikiPage.php:350 +#: ../../Zotlabs/Lib/NativeWikiPage.php:400 +#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +#: ../../Zotlabs/Lib/NativeWikiPage.php:508 msgid "Error reading wiki" msgstr "Se ha producido un error al leer el wiki" -#: ../../Zotlabs/Lib/NativeWikiPage.php:384 +#: ../../Zotlabs/Lib/NativeWikiPage.php:388 msgid "Page update failed." msgstr "Se ha producido un error al actualizar la página." -#: ../../Zotlabs/Lib/NativeWikiPage.php:418 +#: ../../Zotlabs/Lib/NativeWikiPage.php:422 msgid "Nothing deleted" msgstr "No se ha eliminado nada" -#: ../../Zotlabs/Lib/NativeWikiPage.php:484 +#: ../../Zotlabs/Lib/NativeWikiPage.php:488 msgid "Compare: object not found." msgstr "No se ha encontrado un objeto para comparar." -#: ../../Zotlabs/Lib/NativeWikiPage.php:490 +#: ../../Zotlabs/Lib/NativeWikiPage.php:494 msgid "Page updated" msgstr "Se ha actualizado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:493 +#: ../../Zotlabs/Lib/NativeWikiPage.php:497 msgid "Untitled" msgstr "Sin título" -#: ../../Zotlabs/Lib/NativeWikiPage.php:499 +#: ../../Zotlabs/Lib/NativeWikiPage.php:503 msgid "Wiki resource_id required for git commit" msgstr "Se necesita Wiki resource_id para el git commit" -#: ../../Zotlabs/Lib/NativeWikiPage.php:555 +#: ../../Zotlabs/Lib/NativeWikiPage.php:559 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "Mensaje" -#: ../../Zotlabs/Lib/NativeWikiPage.php:593 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:672 -#: ../../include/bbcode.php:818 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 +#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:674 +#: ../../include/bbcode.php:822 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" @@ -7578,23 +7706,23 @@ msgstr "Este es su ajuste predeterminado para establecer quién puede ver su rep msgid "This is your default setting for the audience of your webpages" msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web" -#: ../../Zotlabs/Lib/Chatroom.php:27 +#: ../../Zotlabs/Lib/Chatroom.php:23 msgid "Missing room name" msgstr "Sala de chat sin nombre" -#: ../../Zotlabs/Lib/Chatroom.php:36 +#: ../../Zotlabs/Lib/Chatroom.php:32 msgid "Duplicate room name" msgstr "Nombre de sala duplicado." -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 msgid "Invalid room specifier." msgstr "Especificador de sala no válido." -#: ../../Zotlabs/Lib/Chatroom.php:126 +#: ../../Zotlabs/Lib/Chatroom.php:122 msgid "Room not found." msgstr "Sala no encontrada." -#: ../../Zotlabs/Lib/Chatroom.php:147 +#: ../../Zotlabs/Lib/Chatroom.php:143 msgid "Room is full" msgstr "La sala está llena." @@ -7820,11 +7948,11 @@ msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia." msgid "[$Projectname:Notify]" msgstr "[$Projectname:Aviso]" -#: ../../Zotlabs/Lib/Enotify.php:789 +#: ../../Zotlabs/Lib/Enotify.php:793 msgid "created a new post" msgstr "ha creado una nueva entrada" -#: ../../Zotlabs/Lib/Enotify.php:790 +#: ../../Zotlabs/Lib/Enotify.php:794 #, php-format msgid "commented on %s's post" msgstr "ha comentado la entrada de %s" @@ -7847,208 +7975,208 @@ msgstr "Error de actualización en %s" msgid "Update %s failed. See error logs." msgstr "La actualización %s ha fallado. Mire el informe de errores." -#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:681 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 msgid "Private Message" msgstr "Mensaje Privado" -#: ../../Zotlabs/Lib/ThreadItem.php:137 ../../include/conversation.php:673 +#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 msgid "Select" msgstr "Seleccionar" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will attend" msgstr "Participaré" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I will not attend" msgstr "No participaré" -#: ../../Zotlabs/Lib/ThreadItem.php:162 +#: ../../Zotlabs/Lib/ThreadItem.php:172 msgid "I might attend" msgstr "Quizá participe" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I agree" msgstr "Estoy de acuerdo" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I disagree" msgstr "No estoy de acuerdo" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:182 msgid "I abstain" msgstr "Me abstengo" -#: ../../Zotlabs/Lib/ThreadItem.php:228 +#: ../../Zotlabs/Lib/ThreadItem.php:238 msgid "Add Star" msgstr "Destacar añadiendo una estrella" -#: ../../Zotlabs/Lib/ThreadItem.php:229 +#: ../../Zotlabs/Lib/ThreadItem.php:239 msgid "Remove Star" msgstr "Eliminar estrella" -#: ../../Zotlabs/Lib/ThreadItem.php:230 +#: ../../Zotlabs/Lib/ThreadItem.php:240 msgid "Toggle Star Status" msgstr "Activar o desactivar el estado de entrada preferida" -#: ../../Zotlabs/Lib/ThreadItem.php:234 +#: ../../Zotlabs/Lib/ThreadItem.php:244 msgid "starred" msgstr "preferidas" -#: ../../Zotlabs/Lib/ThreadItem.php:244 ../../include/conversation.php:688 +#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 msgid "Message signature validated" msgstr "Firma de mensaje validada" -#: ../../Zotlabs/Lib/ThreadItem.php:245 ../../include/conversation.php:689 +#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 msgid "Message signature incorrect" msgstr "Firma de mensaje incorrecta" -#: ../../Zotlabs/Lib/ThreadItem.php:253 +#: ../../Zotlabs/Lib/ThreadItem.php:263 msgid "Add Tag" msgstr "Añadir etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:271 ../../include/taxonomy.php:433 +#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:506 msgid "like" msgstr "me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:272 ../../include/taxonomy.php:434 +#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:507 msgid "dislike" msgstr "no me gusta" -#: ../../Zotlabs/Lib/ThreadItem.php:276 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "Share This" msgstr "Compartir esto" -#: ../../Zotlabs/Lib/ThreadItem.php:276 +#: ../../Zotlabs/Lib/ThreadItem.php:286 msgid "share" msgstr "compartir" -#: ../../Zotlabs/Lib/ThreadItem.php:285 +#: ../../Zotlabs/Lib/ThreadItem.php:295 msgid "Delivery Report" msgstr "Informe de transmisión" -#: ../../Zotlabs/Lib/ThreadItem.php:303 +#: ../../Zotlabs/Lib/ThreadItem.php:313 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" -#: ../../Zotlabs/Lib/ThreadItem.php:333 ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 #, php-format msgid "View %s's profile - %s" msgstr "Ver el perfil de %s - %s" -#: ../../Zotlabs/Lib/ThreadItem.php:337 +#: ../../Zotlabs/Lib/ThreadItem.php:347 msgid "to" msgstr "a" -#: ../../Zotlabs/Lib/ThreadItem.php:338 +#: ../../Zotlabs/Lib/ThreadItem.php:348 msgid "via" msgstr "mediante" -#: ../../Zotlabs/Lib/ThreadItem.php:339 +#: ../../Zotlabs/Lib/ThreadItem.php:349 msgid "Wall-to-Wall" msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:340 +#: ../../Zotlabs/Lib/ThreadItem.php:350 msgid "via Wall-To-Wall:" msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:747 +#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 #, php-format msgid "from %s" msgstr "desde %s" -#: ../../Zotlabs/Lib/ThreadItem.php:356 ../../include/conversation.php:750 +#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 #, php-format msgid "last edited: %s" msgstr "último cambio: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:357 ../../include/conversation.php:751 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 #, php-format msgid "Expires: %s" msgstr "Caduca: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:374 msgid "Attend" msgstr "Participar o asistir" -#: ../../Zotlabs/Lib/ThreadItem.php:364 +#: ../../Zotlabs/Lib/ThreadItem.php:375 msgid "Attendance Options" msgstr "Opciones de participación o asistencia" -#: ../../Zotlabs/Lib/ThreadItem.php:365 +#: ../../Zotlabs/Lib/ThreadItem.php:376 msgid "Vote" msgstr "Votar" -#: ../../Zotlabs/Lib/ThreadItem.php:366 +#: ../../Zotlabs/Lib/ThreadItem.php:377 msgid "Voting Options" msgstr "Opciones de votación" -#: ../../Zotlabs/Lib/ThreadItem.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:398 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "Guardar en Marcadores" -#: ../../Zotlabs/Lib/ThreadItem.php:388 +#: ../../Zotlabs/Lib/ThreadItem.php:399 msgid "Add to Calendar" msgstr "Añadir al calendario" -#: ../../Zotlabs/Lib/ThreadItem.php:415 ../../include/conversation.php:471 +#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "Esta es una previsualización sin guardar" -#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "%s mostrar todo" -#: ../../Zotlabs/Lib/ThreadItem.php:744 ../../include/conversation.php:1360 +#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1377 msgid "Bold" msgstr "Negrita" -#: ../../Zotlabs/Lib/ThreadItem.php:745 ../../include/conversation.php:1361 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1378 msgid "Italic" msgstr "Itálico " -#: ../../Zotlabs/Lib/ThreadItem.php:746 ../../include/conversation.php:1362 +#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1379 msgid "Underline" msgstr "Subrayar" -#: ../../Zotlabs/Lib/ThreadItem.php:747 ../../include/conversation.php:1363 +#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1380 msgid "Quote" msgstr "Citar" -#: ../../Zotlabs/Lib/ThreadItem.php:748 ../../include/conversation.php:1364 +#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1381 msgid "Code" msgstr "Código" -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Lib/ThreadItem.php:760 msgid "Image" msgstr "Imagen" -#: ../../Zotlabs/Lib/ThreadItem.php:750 +#: ../../Zotlabs/Lib/ThreadItem.php:761 msgid "Attach File" msgstr "Fichero adjunto" -#: ../../Zotlabs/Lib/ThreadItem.php:751 +#: ../../Zotlabs/Lib/ThreadItem.php:762 msgid "Insert Link" msgstr "Insertar enlace" -#: ../../Zotlabs/Lib/ThreadItem.php:752 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Video" msgstr "Vídeo" -#: ../../Zotlabs/Lib/ThreadItem.php:762 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Your full name (required)" msgstr "Su nombre completo (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:774 msgid "Your email address (required)" msgstr "Su dirección de correo electrónico (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:764 +#: ../../Zotlabs/Lib/ThreadItem.php:775 msgid "Your website URL (optional)" msgstr "La URL de su sitio web (opcional)" @@ -8064,7 +8192,7 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión msgid "Welcome %s. Remote authentication successful." msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente." -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:284 msgid "parent" msgstr "padre" @@ -8080,7 +8208,8 @@ msgstr "Principal" msgid "Addressbook" msgstr "Libreta de direcciones" -#: ../../Zotlabs/Storage/Browser.php:140 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:452 +#: ../../include/nav.php:455 msgid "Calendar" msgstr "Calendario" @@ -8092,48 +8221,41 @@ msgstr "Programar bandeja de entrada" msgid "Schedule Outbox" msgstr "Programar bandeja de salida" -#: ../../Zotlabs/Storage/Browser.php:226 +#: ../../Zotlabs/Storage/Browser.php:270 msgid "Total" msgstr "Total" -#: ../../Zotlabs/Storage/Browser.php:228 +#: ../../Zotlabs/Storage/Browser.php:272 msgid "Shared" msgstr "Compartido" -#: ../../Zotlabs/Storage/Browser.php:304 +#: ../../Zotlabs/Storage/Browser.php:350 #, php-format msgid "You are using %1$s of your available file storage." msgstr "Está usando %1$s de su espacio disponible para ficheros." -#: ../../Zotlabs/Storage/Browser.php:309 +#: ../../Zotlabs/Storage/Browser.php:355 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s%)" -#: ../../Zotlabs/Storage/Browser.php:320 +#: ../../Zotlabs/Storage/Browser.php:366 msgid "WARNING:" msgstr "ATENCIÓN: " -#: ../../Zotlabs/Storage/Browser.php:330 -msgid "" -"Please use DAV to upload large (video, audio) files.
See Cloud Desktop " -"Clients" -msgstr "Por favor, use DAV para subir ficheros de gran tamaño (vídeo, audio).
Mire en Cloud Desktop Clients" - -#: ../../Zotlabs/Storage/Browser.php:334 +#: ../../Zotlabs/Storage/Browser.php:378 msgid "Create new folder" msgstr "Crear nueva carpeta" -#: ../../Zotlabs/Storage/Browser.php:336 +#: ../../Zotlabs/Storage/Browser.php:380 msgid "Upload file" msgstr "Subir fichero" -#: ../../Zotlabs/Storage/Browser.php:350 +#: ../../Zotlabs/Storage/Browser.php:393 msgid "Drop files here to immediately upload" msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata" -#: ../../Zotlabs/Widget/Forums.php:85 +#: ../../Zotlabs/Widget/Forums.php:99 msgid "Forums" msgstr "Foros" @@ -8149,80 +8271,81 @@ msgstr "Lectura y escritura" msgid "Read-only" msgstr "Sólo lectura" -#: ../../Zotlabs/Widget/Cdav.php:116 +#: ../../Zotlabs/Widget/Cdav.php:117 msgid "My Calendars" msgstr "Mis calendarios" -#: ../../Zotlabs/Widget/Cdav.php:118 +#: ../../Zotlabs/Widget/Cdav.php:119 msgid "Shared Calendars" msgstr "Calendarios compartidos" -#: ../../Zotlabs/Widget/Cdav.php:122 +#: ../../Zotlabs/Widget/Cdav.php:123 msgid "Share this calendar" msgstr "Compartir este calendario" -#: ../../Zotlabs/Widget/Cdav.php:124 +#: ../../Zotlabs/Widget/Cdav.php:125 msgid "Calendar name and color" msgstr "Nombre y color del calendario" -#: ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Widget/Cdav.php:127 msgid "Create new calendar" msgstr "Crear un nuevo calendario" -#: ../../Zotlabs/Widget/Cdav.php:128 +#: ../../Zotlabs/Widget/Cdav.php:129 msgid "Calendar Name" msgstr "Nombre del calendario" -#: ../../Zotlabs/Widget/Cdav.php:129 +#: ../../Zotlabs/Widget/Cdav.php:130 msgid "Calendar Tools" msgstr "Gestión de calendarios" -#: ../../Zotlabs/Widget/Cdav.php:130 +#: ../../Zotlabs/Widget/Cdav.php:131 msgid "Import calendar" msgstr "Importar un calendario" -#: ../../Zotlabs/Widget/Cdav.php:131 +#: ../../Zotlabs/Widget/Cdav.php:132 msgid "Select a calendar to import to" msgstr "Seleccionar un calendario para importarlo" -#: ../../Zotlabs/Widget/Cdav.php:158 +#: ../../Zotlabs/Widget/Cdav.php:159 msgid "Addressbooks" msgstr "Agenda de direcciones" -#: ../../Zotlabs/Widget/Cdav.php:160 +#: ../../Zotlabs/Widget/Cdav.php:161 msgid "Addressbook name" msgstr "Nombre de la agenda" -#: ../../Zotlabs/Widget/Cdav.php:162 +#: ../../Zotlabs/Widget/Cdav.php:163 msgid "Create new addressbook" msgstr "Crear una nueva agenda de direcciones" -#: ../../Zotlabs/Widget/Cdav.php:163 +#: ../../Zotlabs/Widget/Cdav.php:164 msgid "Addressbook Name" msgstr "Nombre de la agenda" -#: ../../Zotlabs/Widget/Cdav.php:165 +#: ../../Zotlabs/Widget/Cdav.php:166 msgid "Addressbook Tools" msgstr "Gestión de agendas de direcciones" -#: ../../Zotlabs/Widget/Cdav.php:166 +#: ../../Zotlabs/Widget/Cdav.php:167 msgid "Import addressbook" msgstr "Importar una agenda de direcciones" -#: ../../Zotlabs/Widget/Cdav.php:167 +#: ../../Zotlabs/Widget/Cdav.php:168 msgid "Select an addressbook to import to" msgstr "Seleccionar una agenda para importarla" -#: ../../Zotlabs/Widget/Appcategories.php:39 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 -#: ../../include/contact_widgets.php:132 ../../include/taxonomy.php:285 -#: ../../include/taxonomy.php:367 ../../include/taxonomy.php:387 +#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97 +#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186 +#: ../../include/taxonomy.php:337 ../../include/taxonomy.php:419 +#: ../../include/taxonomy.php:439 ../../include/taxonomy.php:460 msgid "Categories" msgstr "Temas" -#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/contact_widgets.php:135 +#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 +#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 msgid "Everything" msgstr "Todo" @@ -8242,6 +8365,14 @@ msgstr "Importar un calendario" msgid "Suggested Chatrooms" msgstr "Salas de chat sugeridas" +#: ../../Zotlabs/Widget/Hq_controls.php:14 +msgid "HQ Control Panel" +msgstr "Panel de control de HQ" + +#: ../../Zotlabs/Widget/Hq_controls.php:17 +msgid "Create a new post" +msgstr "Crear una nueva entrada" + #: ../../Zotlabs/Widget/Mailmenu.php:13 msgid "Private Mail Menu" msgstr "Menú de correo privado" @@ -8250,21 +8381,21 @@ msgstr "Menú de correo privado" msgid "Combined View" msgstr "Vista combinada" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:126 msgid "Inbox" msgstr "Bandeja de entrada" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:120 +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:127 msgid "Outbox" msgstr "Bandeja de salida" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:121 +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:128 msgid "New Message" msgstr "Nuevo mensaje" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1847 ../../include/conversation.php:1850 -#: ../../include/nav.php:455 ../../include/nav.php:458 +#: ../../include/conversation.php:1864 ../../include/conversation.php:1867 +#: ../../include/nav.php:466 ../../include/nav.php:469 msgid "Chatrooms" msgstr "Salas de chat" @@ -8326,11 +8457,11 @@ msgstr "Enviar mensajes" msgid "Conversations" msgstr "Conversaciones" -#: ../../Zotlabs/Widget/Conversations.php:35 +#: ../../Zotlabs/Widget/Conversations.php:37 msgid "No messages." msgstr "Sin mensajes." -#: ../../Zotlabs/Widget/Conversations.php:55 +#: ../../Zotlabs/Widget/Conversations.php:57 msgid "Delete conversation" msgstr "Eliminar conversación" @@ -8346,11 +8477,11 @@ msgstr "foto/imagen" msgid "Remove term" msgstr "Eliminar término" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:306 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:316 msgid "Saved Searches" msgstr "Búsquedas guardadas" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:337 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 msgid "add" msgstr "añadir" @@ -8358,15 +8489,16 @@ msgstr "añadir" msgid "Notes" msgstr "Notas" -#: ../../Zotlabs/Widget/Wiki_pages.php:47 ../../addon/gitwiki/gitwiki.php:76 -msgid "Wiki Pages" -msgstr "Páginas del wiki" - -#: ../../Zotlabs/Widget/Wiki_pages.php:53 ../../addon/gitwiki/gitwiki.php:81 +#: ../../Zotlabs/Widget/Wiki_pages.php:32 +#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81 msgid "Add new page" msgstr "Añadir una nueva página" -#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:82 +#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76 +msgid "Wiki Pages" +msgstr "Páginas del wiki" + +#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82 msgid "Page name" msgstr "Nombre de la página" @@ -8387,7 +8519,7 @@ msgid "See more..." msgstr "Ver más..." #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:395 +#: ../../include/features.php:414 msgid "Saved Folders" msgstr "Carpetas guardadas" @@ -8407,7 +8539,7 @@ msgstr "Examinar la cola" msgid "DB updates" msgstr "Actualizaciones de la base de datos" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:224 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:231 msgid "Admin" msgstr "Administrador" @@ -8447,7 +8579,7 @@ msgstr "Exportar canal" msgid "Connected apps" msgstr "Aplicaciones (apps) conectadas" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:158 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168 msgid "Permission Groups" msgstr "Grupos de permisos" @@ -8467,165 +8599,170 @@ msgstr "Nueva actividad en la red" msgid "New Network Activity Notifications" msgstr "Avisos de nueva actividad en la red" -#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:99 +#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:106 msgid "View your network activity" msgstr "Ver su actividad en la red" -#: ../../Zotlabs/Widget/Notifications.php:24 +#: ../../Zotlabs/Widget/Notifications.php:23 msgid "Mark all notifications read" msgstr "Marcar todas las notificaciones como leídas" -#: ../../Zotlabs/Widget/Notifications.php:32 +#: ../../Zotlabs/Widget/Notifications.php:26 +#: ../../Zotlabs/Widget/Notifications.php:44 +#: ../../Zotlabs/Widget/Notifications.php:139 +msgid "Show new posts only" +msgstr "Mostrar solo las entradas nuevas" + +#: ../../Zotlabs/Widget/Notifications.php:34 msgid "New Home Activity" msgstr "Nueva actividad en su página principal" -#: ../../Zotlabs/Widget/Notifications.php:33 +#: ../../Zotlabs/Widget/Notifications.php:35 msgid "New Home Activity Notifications" msgstr "Avisos de nueva actividad en su página principal" -#: ../../Zotlabs/Widget/Notifications.php:36 +#: ../../Zotlabs/Widget/Notifications.php:38 msgid "View your home activity" msgstr "Ver su actividad en su página principal" -#: ../../Zotlabs/Widget/Notifications.php:40 +#: ../../Zotlabs/Widget/Notifications.php:41 #: ../../Zotlabs/Widget/Notifications.php:136 msgid "Mark all notifications seen" msgstr "Marcar todas las notificaciones como vistas" -#: ../../Zotlabs/Widget/Notifications.php:48 +#: ../../Zotlabs/Widget/Notifications.php:52 msgid "New Mails" msgstr "Nuevos mensajes de correo" -#: ../../Zotlabs/Widget/Notifications.php:49 +#: ../../Zotlabs/Widget/Notifications.php:53 msgid "New Mails Notifications" msgstr "Avisos de nuevos mensajes de correo" -#: ../../Zotlabs/Widget/Notifications.php:52 +#: ../../Zotlabs/Widget/Notifications.php:56 msgid "View your private mails" msgstr "Ver sus correos privados" -#: ../../Zotlabs/Widget/Notifications.php:56 +#: ../../Zotlabs/Widget/Notifications.php:59 msgid "Mark all messages seen" msgstr "Marcar todos los mensajes como vistos" -#: ../../Zotlabs/Widget/Notifications.php:64 +#: ../../Zotlabs/Widget/Notifications.php:67 msgid "New Events" msgstr "Eventos nuevos" -#: ../../Zotlabs/Widget/Notifications.php:65 +#: ../../Zotlabs/Widget/Notifications.php:68 msgid "New Events Notifications" msgstr "Avisos de nuevos eventos" -#: ../../Zotlabs/Widget/Notifications.php:68 ../../include/nav.php:125 +#: ../../Zotlabs/Widget/Notifications.php:71 ../../include/nav.php:132 msgid "View events" msgstr "Ver los eventos" -#: ../../Zotlabs/Widget/Notifications.php:72 ../../include/nav.php:126 +#: ../../Zotlabs/Widget/Notifications.php:74 ../../include/nav.php:133 msgid "Mark all events seen" msgstr "Marcar todos los eventos como leidos" -#: ../../Zotlabs/Widget/Notifications.php:81 +#: ../../Zotlabs/Widget/Notifications.php:83 msgid "New Connections Notifications" msgstr "Avisos de nuevas conexiones" -#: ../../Zotlabs/Widget/Notifications.php:84 +#: ../../Zotlabs/Widget/Notifications.php:86 msgid "View all connections" msgstr "Ver todas las conexiones" -#: ../../Zotlabs/Widget/Notifications.php:92 +#: ../../Zotlabs/Widget/Notifications.php:94 msgid "New Files" msgstr "Ficheros nuevos" -#: ../../Zotlabs/Widget/Notifications.php:93 +#: ../../Zotlabs/Widget/Notifications.php:95 msgid "New Files Notifications" msgstr "Avisos de nuevos ficheros" -#: ../../Zotlabs/Widget/Notifications.php:100 -#: ../../Zotlabs/Widget/Notifications.php:101 ../../include/nav.php:112 +#: ../../Zotlabs/Widget/Notifications.php:102 +#: ../../Zotlabs/Widget/Notifications.php:103 ../../include/nav.php:119 msgid "Notices" msgstr "Avisos" -#: ../../Zotlabs/Widget/Notifications.php:104 +#: ../../Zotlabs/Widget/Notifications.php:106 msgid "View all notices" msgstr "Ver todos los avisos" -#: ../../Zotlabs/Widget/Notifications.php:108 +#: ../../Zotlabs/Widget/Notifications.php:109 msgid "Mark all notices seen" msgstr "Marcar como leídos todos los avisos" -#: ../../Zotlabs/Widget/Notifications.php:118 +#: ../../Zotlabs/Widget/Notifications.php:119 msgid "New Registrations" msgstr "Registros nuevos" -#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 msgid "New Registrations Notifications" msgstr "Notificaciones de nuevos registros" -#: ../../Zotlabs/Widget/Notifications.php:129 +#: ../../Zotlabs/Widget/Notifications.php:130 msgid "Public Stream Notifications" msgstr "Avisos del \"stream\" público" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:133 msgid "View the public stream" msgstr "Ver el \"stream\" público" -#: ../../Zotlabs/Widget/Notifications.php:143 -#: ../../include/conversation.php:871 ../../include/nav.php:305 -msgid "Loading..." -msgstr "Cargando..." +#: ../../Zotlabs/Widget/Notifications.php:147 ../../include/nav.php:316 +msgid "Loading" +msgstr "Cargando" #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "No se ha encontrado el canal de origen." -#: ../../boot.php:1619 +#: ../../boot.php:1644 msgid "Create an account to access services and applications" msgstr "Crear una cuenta para acceder a los servicios y aplicaciones" -#: ../../boot.php:1638 ../../include/nav.php:138 ../../include/nav.php:167 -#: ../../include/nav.php:184 +#: ../../boot.php:1663 ../../include/nav.php:145 ../../include/nav.php:174 +#: ../../include/nav.php:191 msgid "Logout" msgstr "Finalizar sesión" -#: ../../boot.php:1642 +#: ../../boot.php:1667 msgid "Login/Email" msgstr "Inicio de sesión / Correo electrónico" -#: ../../boot.php:1643 +#: ../../boot.php:1668 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1644 +#: ../../boot.php:1669 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1647 +#: ../../boot.php:1672 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:2191 +#: ../../boot.php:2257 msgid "toggle mobile" msgstr "cambiar a modo móvil" -#: ../../boot.php:2344 +#: ../../boot.php:2419 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error SSL del sitio web en %s" -#: ../../boot.php:2349 +#: ../../boot.php:2424 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema." -#: ../../boot.php:2468 +#: ../../boot.php:2540 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s" -#: ../../boot.php:2473 +#: ../../boot.php:2545 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." -#: ../../boot.php:2474 ../../include/datetime.php:286 +#: ../../boot.php:2546 ../../include/datetime.php:292 msgid "never" msgstr "nunca" @@ -8883,30 +9020,30 @@ msgstr "Un ajuste" msgid "Skeleton Settings" msgstr "Ajustes de Skeleton" -#: ../../addon/gnusoc/gnusoc.php:243 +#: ../../addon/gnusoc/gnusoc.php:247 msgid "GNU-Social Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo de GNU-Social." -#: ../../addon/gnusoc/gnusoc.php:262 +#: ../../addon/gnusoc/gnusoc.php:266 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos." -#: ../../addon/gnusoc/gnusoc.php:265 +#: ../../addon/gnusoc/gnusoc.php:269 msgid "Enable the GNU-Social protocol for this channel" msgstr "Activar el protocolo de GNU-Social para este canal" -#: ../../addon/gnusoc/gnusoc.php:269 +#: ../../addon/gnusoc/gnusoc.php:273 msgid "GNU-Social Protocol Settings" msgstr "Ajustes del protocolo de GNU-Social" -#: ../../addon/gnusoc/gnusoc.php:460 +#: ../../addon/gnusoc/gnusoc.php:464 msgid "Follow" msgstr "Seguir" -#: ../../addon/gnusoc/gnusoc.php:463 +#: ../../addon/gnusoc/gnusoc.php:467 #, php-format msgid "%1$s is now following %2$s" msgstr "%1$s está siguiendo ahora a %2$s" @@ -8952,8 +9089,8 @@ msgstr "Regresar después" msgid "Page to load after image selection." msgstr "Página para cargar después de la selección de imágenes." -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1266 -#: ../../include/nav.php:146 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301 +#: ../../include/nav.php:153 msgid "Edit Profile" msgstr "Editar el perfil" @@ -9026,7 +9163,7 @@ msgstr "Error desconocido. Por favor, inténtelo otra vez." msgid "Profile photo updated successfully." msgstr "Se ha actualizado con éxito la foto de perfil." -#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:3983 +#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:4051 msgid "invalid target signature" msgstr "La firma recibida no es válida" @@ -9159,38 +9296,6 @@ msgstr "Ajustes de publicación en InsaneJournal" msgid "Insane Journal Settings saved." msgstr "Se han guardado los ajustes de InsaneJournal." -#: ../../addon/js_upload/js_upload.php:44 -msgid "Upload a file" -msgstr "Subir un fichero" - -#: ../../addon/js_upload/js_upload.php:45 -msgid "Drop files here to upload" -msgstr "Arrastre los ficheros aquí para subirlos" - -#: ../../addon/js_upload/js_upload.php:47 -msgid "Failed" -msgstr "Ha fallado" - -#: ../../addon/js_upload/js_upload.php:315 -msgid "No files were uploaded." -msgstr "No se han subido ficheros." - -#: ../../addon/js_upload/js_upload.php:322 -msgid "Uploaded file is empty" -msgstr "El fichero subido está vacío" - -#: ../../addon/js_upload/js_upload.php:335 -msgid "Image exceeds size limit of " -msgstr "La imagen supera el límite de tamaño de " - -#: ../../addon/js_upload/js_upload.php:347 -msgid "File has an invalid extension, it should be one of " -msgstr "El fichero tiene una extensión no válida, debería ser una de estas: " - -#: ../../addon/js_upload/js_upload.php:359 -msgid "Upload was cancelled, or server error encountered" -msgstr "Se canceló la carga o se encontró un error del servidor" - #: ../../addon/dwpost/dwpost.php:42 msgid "Post to Dreamwidth" msgstr "Publicar en Dreamwidth" @@ -9215,18 +9320,6 @@ msgstr "Publicar en Dreamwidth de forma predeterminada" msgid "Dreamwidth Post Settings" msgstr "Ajustes de publicación en Dreamwidth" -#: ../../addon/firefox/firefox.php:23 -msgid "Install Firefox Sharing Tools" -msgstr "Instalar las herramientas de compartición de Firefox" - -#: ../../addon/firefox/firefox.php:34 -msgid "Share content from Firefox to $Projectname" -msgstr "Compartir contenido desde Firefox a $Projectname" - -#: ../../addon/firefox/firefox.php:37 -msgid "Install Firefox Sharing Tools to this web browser" -msgstr "Instalar las herramientas de compartición de Firefox en este navegador" - #: ../../addon/dirstats/dirstats.php:94 msgid "Hubzilla Directory Stats" msgstr "Estadísticas de directorio de Hubzilla" @@ -9286,22 +9379,6 @@ msgid "" "applies to chatrooms," msgstr "Tenga en cuenta que las estadísticas de Diaspora y Friendica se refieren únicamente a aquellas de las que **este directorio** es consciente, y no a todos los conocidos en la red. Esto también es aplicable a las salas de chat," -#: ../../addon/mailhost/mailhost.php:36 -msgid "Email notification hub" -msgstr "Notificación por correo electrónico del hub" - -#: ../../addon/mailhost/mailhost.php:36 -msgid "Hostname" -msgstr "Nombre del host" - -#: ../../addon/mailhost/mailhost.php:40 -msgid "Mailhost Settings" -msgstr "Ajustes de Mailhost" - -#: ../../addon/mailhost/mailhost.php:54 -msgid "MAILHOST Settings saved." -msgstr "Se han guardado los ajustes de MAILHOST." - #: ../../addon/likebanner/likebanner.php:51 msgid "Your Webbie:" msgstr "Su webbie: " @@ -9496,12 +9573,12 @@ msgid "Login failed." msgstr "El acceso ha fallado." #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1432 +#: ../../include/selectors.php:66 ../../include/channel.php:1480 msgid "Male" msgstr "Hombre" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1430 +#: ../../include/selectors.php:66 ../../include/channel.php:1478 msgid "Female" msgstr "Mujer" @@ -9688,39 +9765,39 @@ msgstr "una declaración de amor eterno" msgid "declared undying love for" msgstr "ha declarado amor eterno a" -#: ../../addon/diaspora/diaspora.php:763 +#: ../../addon/diaspora/diaspora.php:772 msgid "Diaspora Protocol Settings updated." msgstr "Los ajustes del protocolo de Diaspora se han actualizado." -#: ../../addon/diaspora/diaspora.php:782 +#: ../../addon/diaspora/diaspora.php:791 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos." -#: ../../addon/diaspora/diaspora.php:785 +#: ../../addon/diaspora/diaspora.php:794 msgid "Enable the Diaspora protocol for this channel" msgstr "Activar el protocolo de Diaspora para este canal" -#: ../../addon/diaspora/diaspora.php:789 +#: ../../addon/diaspora/diaspora.php:798 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas" -#: ../../addon/diaspora/diaspora.php:793 +#: ../../addon/diaspora/diaspora.php:802 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/diaspora.php:797 +#: ../../addon/diaspora/diaspora.php:806 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" -#: ../../addon/diaspora/diaspora.php:802 +#: ../../addon/diaspora/diaspora.php:811 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:816 msgid "Diaspora Protocol Settings" msgstr "Ajustes del protocolo de Diaspora" @@ -9829,6 +9906,26 @@ msgstr "Seleccione la valoración adecuada del avatar para su sitio. Ver README" msgid "Gravatar settings updated." msgstr "Se han actualizado los ajustes de Gravatar." +#: ../../addon/hzfiles/hzfiles.php:79 +msgid "Hubzilla File Storage Import" +msgstr "Importar del depósito de ficheros de Hubzilla" + +#: ../../addon/hzfiles/hzfiles.php:80 +msgid "This will import all your cloud files from another server." +msgstr "Esto importará todos sus ficheros en la nube desde otro servidor." + +#: ../../addon/hzfiles/hzfiles.php:81 +msgid "Hubzilla Server base URL" +msgstr "URL base del servidor Hubzilla" + +#: ../../addon/hzfiles/hzfiles.php:82 +msgid "Since modified date yyyy-mm-dd" +msgstr "Modificado desde la fecha yyyy-mm-dd" + +#: ../../addon/hzfiles/hzfiles.php:83 +msgid "Until modified date yyyy-mm-dd" +msgstr "Modificado hasta la fecha yyyy-mm-dd" + #: ../../addon/visage/visage.php:93 msgid "Recent Channel/Profile Viewers" msgstr "Visitantes recientes del canal o perfil" @@ -9975,8 +10072,8 @@ msgstr "Contraseña de Friendica" msgid "Hubzilla to Friendica Post Settings" msgstr "Ajustes de publicación de Hubzilla a Friendica" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1357 -#: ../../include/channel.php:1519 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397 +#: ../../include/channel.php:1567 msgid "Status:" msgstr "Estado:" @@ -10141,27 +10238,35 @@ msgstr "Nombre de inicio de sesión en Friendica" msgid "Friendica Login Password" msgstr "Contraseña de inicio de sesión en Friendica" -#: ../../addon/pubcrawl/as.php:1076 ../../addon/pubcrawl/as.php:1160 -#: ../../addon/pubcrawl/as.php:1332 ../../include/network.php:1705 +#: ../../addon/pubcrawl/as.php:1077 ../../addon/pubcrawl/as.php:1164 +#: ../../addon/pubcrawl/as.php:1339 ../../include/network.php:1768 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/pubcrawl.php:1032 +#: ../../addon/pubcrawl/pubcrawl.php:1033 msgid "ActivityPub Protocol Settings updated." msgstr "Se han actualizado los ajustes del protocolo ActivityPub." -#: ../../addon/pubcrawl/pubcrawl.php:1041 +#: ../../addon/pubcrawl/pubcrawl.php:1042 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos." -#: ../../addon/pubcrawl/pubcrawl.php:1044 +#: ../../addon/pubcrawl/pubcrawl.php:1045 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activar el protocolo ActivityPub para este canal" -#: ../../addon/pubcrawl/pubcrawl.php:1049 +#: ../../addon/pubcrawl/pubcrawl.php:1048 +msgid "Send multi-media HTML articles" +msgstr "Enviar artículos multimedia en HTML" + +#: ../../addon/pubcrawl/pubcrawl.php:1048 +msgid "Not supported by some microblog services such as Mastodon" +msgstr "No soportado por algunos servicios de microblog como Mastodon" + +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings" msgstr "Ajustes del protocolo ActivityPub" @@ -10507,11 +10612,11 @@ msgstr "Limpiar la configuración de OAuth" msgid "GNU social Post Settings" msgstr "Ajustes de publicación en GNU social" -#: ../../addon/statusnet/statusnet.php:891 +#: ../../addon/statusnet/statusnet.php:892 msgid "API URL" msgstr "URL de la API" -#: ../../addon/statusnet/statusnet.php:894 +#: ../../addon/statusnet/statusnet.php:895 msgid "Application name" msgstr "Nombre de la aplicación" @@ -10551,7 +10656,7 @@ msgstr "Debe elegir blancas o negras." msgid "Error creating new game." msgstr "Error al crear un nuevo juego." -#: ../../addon/chess/chess.php:409 ../../include/channel.php:1117 +#: ../../addon/chess/chess.php:409 ../../include/channel.php:1152 msgid "Requested channel is not available." msgstr "El canal solicitado no está disponible." @@ -11001,7 +11106,7 @@ msgstr "sudoroso/a" #: ../../addon/moremoods/moremoods.php:36 msgid "bleeding out" -msgstr "una maldición" +msgstr "exánime" #: ../../addon/moremoods/moremoods.php:37 msgid "victorious" @@ -11230,11 +11335,11 @@ msgstr "Transexual" msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:49 ../../include/channel.php:1436 +#: ../../include/selectors.php:49 ../../include/channel.php:1484 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:49 ../../include/channel.php:1438 +#: ../../include/selectors.php:49 ../../include/channel.php:1486 msgid "Non-specific" msgstr "No especificado" @@ -11414,284 +11519,306 @@ msgstr "No me importa" msgid "Ask me" msgstr "Pregúnteme" -#: ../../include/conversation.php:200 +#: ../../include/conversation.php:169 +#, php-format +msgid "likes %1$s's %2$s" +msgstr "gusta de %2$s de %1$s" + +#: ../../include/conversation.php:172 +#, php-format +msgid "doesn't like %1$s's %2$s" +msgstr "no gusta de %2$s de %1$s" + +#: ../../include/conversation.php:212 #, php-format msgid "%1$s is now connected with %2$s" msgstr "%1$s ahora está conectado/a con %2$s" -#: ../../include/conversation.php:235 +#: ../../include/conversation.php:247 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s ha dado un toque a %2$s" -#: ../../include/conversation.php:239 ../../include/text.php:1104 +#: ../../include/conversation.php:251 ../../include/text.php:1104 #: ../../include/text.php:1109 msgid "poked" msgstr "ha dado un toque a" -#: ../../include/conversation.php:720 +#: ../../include/conversation.php:736 #, php-format msgid "View %s's profile @ %s" msgstr "Ver el perfil @ %s de %s" -#: ../../include/conversation.php:740 +#: ../../include/conversation.php:756 msgid "Categories:" msgstr "Temas:" -#: ../../include/conversation.php:741 +#: ../../include/conversation.php:757 msgid "Filed under:" msgstr "Archivado bajo:" -#: ../../include/conversation.php:766 +#: ../../include/conversation.php:783 msgid "View in context" msgstr "Mostrar en su contexto" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:884 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:888 +msgid "Loading..." +msgstr "Cargando..." + +#: ../../include/conversation.php:889 msgid "Delete Selected Items" msgstr "Eliminar elementos seleccionados" -#: ../../include/conversation.php:915 +#: ../../include/conversation.php:932 msgid "View Source" msgstr "Ver el código fuente de la entrada" -#: ../../include/conversation.php:925 +#: ../../include/conversation.php:942 msgid "Follow Thread" msgstr "Seguir este hilo" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:951 msgid "Unfollow Thread" msgstr "Dejar de seguir este hilo" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:1042 msgid "Activity/Posts" msgstr "Actividad y publicaciones" -#: ../../include/conversation.php:1045 +#: ../../include/conversation.php:1062 msgid "Edit Connection" msgstr "Editar conexión" -#: ../../include/conversation.php:1055 +#: ../../include/conversation.php:1072 msgid "Message" msgstr "Mensaje" -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1206 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1206 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1193 +#: ../../include/conversation.php:1210 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "a %2$d personas le gusta esto." msgstr[1] "A %2$d personas les gusta esto." -#: ../../include/conversation.php:1195 +#: ../../include/conversation.php:1212 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "a %2$d personas no les gusta esto." msgstr[1] "A %2$d personas no les gusta esto." -#: ../../include/conversation.php:1201 +#: ../../include/conversation.php:1218 msgid "and" msgstr "y" -#: ../../include/conversation.php:1204 +#: ../../include/conversation.php:1221 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", y %d persona más" msgstr[1] ", y %d personas más" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1222 #, php-format msgid "%s like this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1222 #, php-format msgid "%s don't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1248 +#: ../../include/conversation.php:1265 msgid "Set your location" msgstr "Establecer su ubicación" -#: ../../include/conversation.php:1249 +#: ../../include/conversation.php:1266 msgid "Clear browser location" msgstr "Eliminar los datos de localización geográfica del navegador" -#: ../../include/conversation.php:1297 +#: ../../include/conversation.php:1314 msgid "Tag term:" msgstr "Término de la etiqueta:" -#: ../../include/conversation.php:1298 +#: ../../include/conversation.php:1315 msgid "Where are you right now?" msgstr "¿Donde está ahora?" -#: ../../include/conversation.php:1303 +#: ../../include/conversation.php:1320 msgid "Choose a different album..." msgstr "Elegir un álbum diferente..." -#: ../../include/conversation.php:1307 +#: ../../include/conversation.php:1324 msgid "Comments enabled" msgstr "Comentarios habilitados" -#: ../../include/conversation.php:1308 +#: ../../include/conversation.php:1325 msgid "Comments disabled" msgstr "Comentarios deshabilitados" -#: ../../include/conversation.php:1355 +#: ../../include/conversation.php:1372 msgid "Page link name" msgstr "Nombre del enlace de la página" -#: ../../include/conversation.php:1358 +#: ../../include/conversation.php:1375 msgid "Post as" msgstr "Publicar como" -#: ../../include/conversation.php:1372 +#: ../../include/conversation.php:1389 msgid "Toggle voting" msgstr "Cambiar votación" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1392 msgid "Disable comments" msgstr "Dehabilitar los comentarios" -#: ../../include/conversation.php:1376 +#: ../../include/conversation.php:1393 msgid "Toggle comments" msgstr "Activar o desactivar los comentarios" -#: ../../include/conversation.php:1384 +#: ../../include/conversation.php:1401 msgid "Categories (optional, comma-separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../include/conversation.php:1407 +#: ../../include/conversation.php:1424 msgid "Other networks and post services" msgstr "Otras redes y servicios de publicación" -#: ../../include/conversation.php:1413 +#: ../../include/conversation.php:1430 msgid "Set publish date" msgstr "Establecer la fecha de publicación" -#: ../../include/conversation.php:1673 +#: ../../include/conversation.php:1690 msgid "Commented Order" msgstr "Comentarios recientes" -#: ../../include/conversation.php:1676 +#: ../../include/conversation.php:1693 msgid "Sort by Comment Date" msgstr "Ordenar por fecha de comentario" -#: ../../include/conversation.php:1680 +#: ../../include/conversation.php:1697 msgid "Posted Order" msgstr "Publicaciones recientes" -#: ../../include/conversation.php:1683 +#: ../../include/conversation.php:1700 msgid "Sort by Post Date" msgstr "Ordenar por fecha de publicación" -#: ../../include/conversation.php:1691 +#: ../../include/conversation.php:1708 msgid "Posts that mention or involve you" msgstr "Publicaciones que le mencionan o involucran" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1717 msgid "Activity Stream - by date" msgstr "Contenido - por fecha" -#: ../../include/conversation.php:1706 +#: ../../include/conversation.php:1723 msgid "Starred" msgstr "Preferidas" -#: ../../include/conversation.php:1709 +#: ../../include/conversation.php:1726 msgid "Favourite Posts" msgstr "Publicaciones favoritas" -#: ../../include/conversation.php:1716 +#: ../../include/conversation.php:1733 msgid "Spam" msgstr "Correo basura" -#: ../../include/conversation.php:1719 +#: ../../include/conversation.php:1736 msgid "Posts flagged as SPAM" msgstr "Publicaciones marcadas como basura" -#: ../../include/conversation.php:1794 ../../include/nav.php:402 +#: ../../include/conversation.php:1811 ../../include/nav.php:413 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/conversation.php:1807 ../../include/nav.php:415 +#: ../../include/conversation.php:1824 ../../include/nav.php:426 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/conversation.php:1817 ../../include/nav.php:425 -#: ../../include/photos.php:600 +#: ../../include/conversation.php:1834 ../../include/nav.php:436 +#: ../../include/photos.php:655 msgid "Photo Albums" msgstr "Álbumes de fotos" -#: ../../include/conversation.php:1825 ../../include/nav.php:433 +#: ../../include/conversation.php:1842 ../../include/nav.php:444 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/conversation.php:1862 ../../include/nav.php:468 +#: ../../include/conversation.php:1879 ../../include/nav.php:479 msgid "Bookmarks" msgstr "Marcadores" -#: ../../include/conversation.php:1865 ../../include/nav.php:471 +#: ../../include/conversation.php:1882 ../../include/nav.php:482 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/conversation.php:1876 ../../include/nav.php:482 +#: ../../include/conversation.php:1893 ../../include/nav.php:493 msgid "View Cards" msgstr "Ver las fichas" -#: ../../include/conversation.php:1887 ../../include/nav.php:494 +#: ../../include/conversation.php:1901 +msgid "articles" +msgstr "artículos" + +#: ../../include/conversation.php:1904 ../../include/nav.php:504 +msgid "View Articles" +msgstr "Ver los artículos" + +#: ../../include/conversation.php:1915 ../../include/nav.php:516 msgid "View Webpages" msgstr "Ver páginas web" -#: ../../include/conversation.php:1956 +#: ../../include/conversation.php:1984 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Participaré" msgstr[1] "Participaré" -#: ../../include/conversation.php:1959 +#: ../../include/conversation.php:1987 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "No participaré" msgstr[1] "No participaré" -#: ../../include/conversation.php:1962 +#: ../../include/conversation.php:1990 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indeciso/a" msgstr[1] "Indecisos/as" -#: ../../include/conversation.php:1965 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "De acuerdo" msgstr[1] "De acuerdo" -#: ../../include/conversation.php:1968 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "En desacuerdo" msgstr[1] "En desacuerdo" -#: ../../include/conversation.php:1971 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -11969,7 +12096,7 @@ msgstr "diciembre" msgid "Unknown Attachment" msgstr "Adjunto no reconocido" -#: ../../include/text.php:1394 ../../include/feedutils.php:780 +#: ../../include/text.php:1394 ../../include/feedutils.php:825 msgid "unknown" msgstr "desconocido" @@ -11985,7 +12112,7 @@ msgstr "eliminar del fichero" msgid "Download binary/encrypted content" msgstr "Descargar contenido binario o cifrado" -#: ../../include/text.php:1782 ../../include/language.php:367 +#: ../../include/text.php:1782 ../../include/language.php:364 msgid "default" msgstr "por defecto" @@ -12124,16 +12251,16 @@ msgstr "Invitar a amigos" msgid "Advanced example: name=fred and country=iceland" msgstr "Ejemplo avanzado: nombre=juan y país=españa" -#: ../../include/contact_widgets.php:166 +#: ../../include/contact_widgets.php:223 msgid "Common Connections" msgstr "Conexiones comunes" -#: ../../include/contact_widgets.php:171 +#: ../../include/contact_widgets.php:228 #, php-format msgid "View all %d common connections" msgstr "Ver todas las %d conexiones comunes" -#: ../../include/markdown.php:139 ../../include/bbcode.php:337 +#: ../../include/markdown.php:158 ../../include/bbcode.php:339 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s escribió %2$s siguiente %3$s" @@ -12456,385 +12583,385 @@ msgstr "Visitar %2$s de %1$s" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s ha actualizado %2$s, cambiando %3$s." -#: ../../include/attach.php:250 ../../include/attach.php:339 +#: ../../include/attach.php:265 ../../include/attach.php:361 msgid "Item was not found." msgstr "Elemento no encontrado." -#: ../../include/attach.php:505 +#: ../../include/attach.php:553 msgid "No source file." msgstr "Ningún fichero de origen" -#: ../../include/attach.php:527 +#: ../../include/attach.php:575 msgid "Cannot locate file to replace" msgstr "No se puede localizar el fichero que va a ser sustituido." -#: ../../include/attach.php:545 +#: ../../include/attach.php:593 msgid "Cannot locate file to revise/update" msgstr "No se puede localizar el fichero para revisar/actualizar" -#: ../../include/attach.php:680 +#: ../../include/attach.php:734 #, php-format msgid "File exceeds size limit of %d" msgstr "El fichero supera el limite de tamaño de %d" -#: ../../include/attach.php:694 +#: ../../include/attach.php:754 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos." -#: ../../include/attach.php:864 +#: ../../include/attach.php:929 msgid "File upload failed. Possible system limit or action terminated." msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado." -#: ../../include/attach.php:877 +#: ../../include/attach.php:948 msgid "Stored file could not be verified. Upload failed." msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado." -#: ../../include/attach.php:938 ../../include/attach.php:954 +#: ../../include/attach.php:1022 ../../include/attach.php:1038 msgid "Path not available." msgstr "Ruta no disponible." -#: ../../include/attach.php:1003 ../../include/attach.php:1168 +#: ../../include/attach.php:1087 ../../include/attach.php:1252 msgid "Empty pathname" msgstr "Ruta vacía" -#: ../../include/attach.php:1029 +#: ../../include/attach.php:1113 msgid "duplicate filename or path" msgstr "Nombre duplicado de ruta o fichero" -#: ../../include/attach.php:1054 +#: ../../include/attach.php:1138 msgid "Path not found." msgstr "Ruta no encontrada" -#: ../../include/attach.php:1122 +#: ../../include/attach.php:1206 msgid "mkdir failed." msgstr "mkdir ha fallado." -#: ../../include/attach.php:1126 +#: ../../include/attach.php:1210 msgid "database storage failed." msgstr "el almacenamiento en la base de datos ha fallado." -#: ../../include/attach.php:1174 +#: ../../include/attach.php:1258 msgid "Empty path" msgstr "Ruta vacía" -#: ../../include/security.php:531 +#: ../../include/security.php:532 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado" -#: ../../include/items.php:857 ../../include/items.php:909 +#: ../../include/items.php:885 ../../include/items.php:945 msgid "(Unknown)" msgstr "(Desconocido)" -#: ../../include/items.php:1093 +#: ../../include/items.php:1129 msgid "Visible to anybody on the internet." msgstr "Visible para cualquiera en internet." -#: ../../include/items.php:1095 +#: ../../include/items.php:1131 msgid "Visible to you only." msgstr "Visible sólo para usted." -#: ../../include/items.php:1097 +#: ../../include/items.php:1133 msgid "Visible to anybody in this network." msgstr "Visible para cualquiera en esta red." -#: ../../include/items.php:1099 +#: ../../include/items.php:1135 msgid "Visible to anybody authenticated." msgstr "Visible para cualquiera que esté autenticado." -#: ../../include/items.php:1101 +#: ../../include/items.php:1137 #, php-format msgid "Visible to anybody on %s." msgstr "Visible para cualquiera en %s." -#: ../../include/items.php:1103 +#: ../../include/items.php:1139 msgid "Visible to all connections." msgstr "Visible para todas las conexiones." -#: ../../include/items.php:1105 +#: ../../include/items.php:1141 msgid "Visible to approved connections." msgstr "Visible para las conexiones permitidas." -#: ../../include/items.php:1107 +#: ../../include/items.php:1143 msgid "Visible to specific connections." msgstr "Visible para conexiones específicas." -#: ../../include/items.php:3957 +#: ../../include/items.php:4117 msgid "Privacy group is empty." msgstr "El grupo de canales está vacío." -#: ../../include/items.php:3964 +#: ../../include/items.php:4124 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:3976 +#: ../../include/items.php:4136 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:4327 +#: ../../include/items.php:4485 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 #, php-format msgid "[Edited %s]" msgstr "[se ha editado %s]" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 msgctxt "edit_activity" msgid "Post" msgstr "Publicar" -#: ../../include/items.php:4520 +#: ../../include/items.php:4676 msgctxt "edit_activity" msgid "Comment" msgstr "Comentar" -#: ../../include/channel.php:34 +#: ../../include/channel.php:35 msgid "Unable to obtain identity information from database" msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" -#: ../../include/channel.php:69 +#: ../../include/channel.php:68 msgid "Empty name" msgstr "Nombre vacío" -#: ../../include/channel.php:72 +#: ../../include/channel.php:71 msgid "Name too long" msgstr "Nombre demasiado largo" -#: ../../include/channel.php:183 +#: ../../include/channel.php:188 msgid "No account identifier" msgstr "Ningún identificador de la cuenta" -#: ../../include/channel.php:195 +#: ../../include/channel.php:200 msgid "Nickname is required." msgstr "Se requiere un sobrenombre (alias)." -#: ../../include/channel.php:273 +#: ../../include/channel.php:277 msgid "Unable to retrieve created identity" msgstr "No ha sido posible recuperar la identidad creada" -#: ../../include/channel.php:359 +#: ../../include/channel.php:373 msgid "Default Profile" msgstr "Perfil principal" -#: ../../include/channel.php:512 ../../include/channel.php:601 +#: ../../include/channel.php:532 ../../include/channel.php:621 msgid "Unable to retrieve modified identity" msgstr "No se puede recuperar la identidad modficada" -#: ../../include/channel.php:1263 +#: ../../include/channel.php:1298 msgid "Create New Profile" msgstr "Crear un nuevo perfil" -#: ../../include/channel.php:1283 +#: ../../include/channel.php:1319 msgid "Visible to everybody" msgstr "Visible para todos" -#: ../../include/channel.php:1356 ../../include/channel.php:1475 +#: ../../include/channel.php:1396 ../../include/channel.php:1523 msgid "Gender:" msgstr "Género:" -#: ../../include/channel.php:1358 ../../include/channel.php:1530 +#: ../../include/channel.php:1398 ../../include/channel.php:1578 msgid "Homepage:" msgstr "Página personal:" -#: ../../include/channel.php:1359 +#: ../../include/channel.php:1399 msgid "Online Now" msgstr "Ahora en línea" -#: ../../include/channel.php:1434 +#: ../../include/channel.php:1482 msgid "Trans" msgstr "Trans" -#: ../../include/channel.php:1480 +#: ../../include/channel.php:1528 msgid "Like this channel" msgstr "Me gusta este canal" -#: ../../include/channel.php:1504 +#: ../../include/channel.php:1552 msgid "j F, Y" msgstr "j F Y" -#: ../../include/channel.php:1505 +#: ../../include/channel.php:1553 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1512 +#: ../../include/channel.php:1560 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../../include/channel.php:1525 +#: ../../include/channel.php:1573 #, php-format msgid "for %1$d %2$s" msgstr "por %1$d %2$s" -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1576 msgid "Sexual Preference:" msgstr "Orientación sexual:" -#: ../../include/channel.php:1534 +#: ../../include/channel.php:1582 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/channel.php:1536 +#: ../../include/channel.php:1584 msgid "Political Views:" msgstr "Posición política:" -#: ../../include/channel.php:1538 +#: ../../include/channel.php:1586 msgid "Religion:" msgstr "Religión:" -#: ../../include/channel.php:1542 +#: ../../include/channel.php:1590 msgid "Hobbies/Interests:" msgstr "Aficciones o intereses:" -#: ../../include/channel.php:1544 +#: ../../include/channel.php:1592 msgid "Likes:" msgstr "Me gusta:" -#: ../../include/channel.php:1546 +#: ../../include/channel.php:1594 msgid "Dislikes:" msgstr "No me gusta:" -#: ../../include/channel.php:1548 +#: ../../include/channel.php:1596 msgid "Contact information and Social Networks:" msgstr "Información de contacto y redes sociales:" -#: ../../include/channel.php:1550 +#: ../../include/channel.php:1598 msgid "My other channels:" msgstr "Mis otros canales:" -#: ../../include/channel.php:1552 +#: ../../include/channel.php:1600 msgid "Musical interests:" msgstr "Preferencias musicales:" -#: ../../include/channel.php:1554 +#: ../../include/channel.php:1602 msgid "Books, literature:" msgstr "Libros, literatura:" -#: ../../include/channel.php:1556 +#: ../../include/channel.php:1604 msgid "Television:" msgstr "Televisión:" -#: ../../include/channel.php:1558 +#: ../../include/channel.php:1606 msgid "Film/dance/culture/entertainment:" msgstr "Cine, danza, cultura, entretenimiento:" -#: ../../include/channel.php:1560 +#: ../../include/channel.php:1608 msgid "Love/Romance:" msgstr "Vida sentimental o amorosa:" -#: ../../include/channel.php:1562 +#: ../../include/channel.php:1610 msgid "Work/employment:" msgstr "Trabajo:" -#: ../../include/channel.php:1564 +#: ../../include/channel.php:1612 msgid "School/education:" msgstr "Estudios:" -#: ../../include/channel.php:1587 +#: ../../include/channel.php:1635 msgid "Like this thing" msgstr "Me gusta esto" -#: ../../include/event.php:22 ../../include/event.php:69 +#: ../../include/event.php:23 ../../include/event.php:70 msgid "l F d, Y \\@ g:i A" msgstr "l d de F, Y \\@ G:i" -#: ../../include/event.php:30 ../../include/event.php:73 +#: ../../include/event.php:31 ../../include/event.php:74 msgid "Starts:" msgstr "Comienza:" -#: ../../include/event.php:40 ../../include/event.php:77 +#: ../../include/event.php:41 ../../include/event.php:78 msgid "Finishes:" msgstr "Finaliza:" -#: ../../include/event.php:1008 +#: ../../include/event.php:1011 msgid "This event has been added to your calendar." msgstr "Este evento ha sido añadido a su calendario." -#: ../../include/event.php:1208 +#: ../../include/event.php:1220 msgid "Not specified" msgstr "Sin especificar" -#: ../../include/event.php:1209 +#: ../../include/event.php:1221 msgid "Needs Action" msgstr "Necesita de una intervención" -#: ../../include/event.php:1210 +#: ../../include/event.php:1222 msgid "Completed" msgstr "Completado/a" -#: ../../include/event.php:1211 +#: ../../include/event.php:1223 msgid "In Process" msgstr "En proceso" -#: ../../include/event.php:1212 +#: ../../include/event.php:1224 msgid "Cancelled" msgstr "Cancelado/a" -#: ../../include/event.php:1292 ../../include/connections.php:684 +#: ../../include/event.php:1303 ../../include/connections.php:684 msgid "Home, Voice" msgstr "Llamadas particulares" -#: ../../include/event.php:1293 ../../include/connections.php:685 +#: ../../include/event.php:1304 ../../include/connections.php:685 msgid "Home, Fax" msgstr "Fax particular" -#: ../../include/event.php:1295 ../../include/connections.php:687 +#: ../../include/event.php:1306 ../../include/connections.php:687 msgid "Work, Voice" msgstr "Llamadas de trabajo" -#: ../../include/event.php:1296 ../../include/connections.php:688 +#: ../../include/event.php:1307 ../../include/connections.php:688 msgid "Work, Fax" msgstr "Fax de trabajo" -#: ../../include/network.php:752 +#: ../../include/network.php:761 msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1700 ../../include/network.php:1701 +#: ../../include/network.php:1763 ../../include/network.php:1764 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1702 +#: ../../include/network.php:1765 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1703 +#: ../../include/network.php:1766 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1704 +#: ../../include/network.php:1767 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1707 +#: ../../include/network.php:1770 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1708 +#: ../../include/network.php:1771 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1709 +#: ../../include/network.php:1772 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1710 +#: ../../include/network.php:1773 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1711 +#: ../../include/network.php:1774 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1712 +#: ../../include/network.php:1775 msgid "MySpace" msgstr "MySpace" -#: ../../include/language.php:380 +#: ../../include/language.php:377 msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" @@ -12872,24 +12999,24 @@ msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha msgid "Cannot locate DNS info for database server '%s'" msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”" -#: ../../include/bbcode.php:194 ../../include/bbcode.php:1102 -#: ../../include/bbcode.php:1105 ../../include/bbcode.php:1110 -#: ../../include/bbcode.php:1113 ../../include/bbcode.php:1116 -#: ../../include/bbcode.php:1119 ../../include/bbcode.php:1124 -#: ../../include/bbcode.php:1127 ../../include/bbcode.php:1132 -#: ../../include/bbcode.php:1135 ../../include/bbcode.php:1138 -#: ../../include/bbcode.php:1141 +#: ../../include/bbcode.php:194 ../../include/bbcode.php:1106 +#: ../../include/bbcode.php:1109 ../../include/bbcode.php:1114 +#: ../../include/bbcode.php:1117 ../../include/bbcode.php:1120 +#: ../../include/bbcode.php:1123 ../../include/bbcode.php:1128 +#: ../../include/bbcode.php:1131 ../../include/bbcode.php:1136 +#: ../../include/bbcode.php:1139 ../../include/bbcode.php:1142 +#: ../../include/bbcode.php:1145 msgid "Image/photo" msgstr "Imagen/foto" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:1152 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1156 msgid "Encrypted content" msgstr "Contenido cifrado" #: ../../include/bbcode.php:249 #, php-format -msgid "Install %s element: " -msgstr "Instalar el elemento %s:" +msgid "Install %1$s element %2$s" +msgstr "Instalar el elemento de%1$s%2$s" #: ../../include/bbcode.php:253 #, php-format @@ -12902,15 +13029,19 @@ msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan p msgid "card" msgstr "ficha" -#: ../../include/bbcode.php:414 ../../include/bbcode.php:422 +#: ../../include/bbcode.php:333 +msgid "article" +msgstr "artículo" + +#: ../../include/bbcode.php:416 ../../include/bbcode.php:424 msgid "Click to open/close" msgstr "Pulsar para abrir/cerrar" -#: ../../include/bbcode.php:422 +#: ../../include/bbcode.php:424 msgid "spoiler" msgstr "spoiler" -#: ../../include/bbcode.php:1090 +#: ../../include/bbcode.php:1094 msgid "$1 wrote:" msgstr "$1 escribió:" @@ -12930,10 +13061,10 @@ msgstr "Contenido incorporado" msgid "Embedding disabled" msgstr "Incrustación deshabilitada" -#: ../../include/zid.php:305 +#: ../../include/zid.php:340 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" -msgstr "OpenWebAuth: %1$sda la bienvenida a %2$s" +msgstr "OpenWebAuth: %1$s da la bienvenida a %2$s" #: ../../include/features.php:54 msgid "General Features" @@ -12987,292 +13118,296 @@ msgstr "Habilita una herramienta para guardar notas y recordatorios (advertencia msgid "Create personal planning cards" msgstr "Crear fichas de planificación personal" -#: ../../include/features.php:131 +#: ../../include/features.php:141 msgid "Navigation Channel Select" msgstr "Navegación por el selector de canales" -#: ../../include/features.php:132 +#: ../../include/features.php:142 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Cambiar de canales directamente desde el menú de navegación desplegable" -#: ../../include/features.php:140 +#: ../../include/features.php:150 msgid "Photo Location" msgstr "Ubicación de las fotos" -#: ../../include/features.php:141 +#: ../../include/features.php:151 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa." -#: ../../include/features.php:149 +#: ../../include/features.php:159 msgid "Access Controlled Chatrooms" msgstr "Salas de chat moderadas" -#: ../../include/features.php:150 +#: ../../include/features.php:160 msgid "Provide chatrooms and chat services with access control." msgstr "Proporcionar salas y servicios de chat moderados." -#: ../../include/features.php:159 +#: ../../include/features.php:169 msgid "Provide alternate connection permission roles." msgstr "Proporcionar roles de acceso alternativos para esta conexión." -#: ../../include/features.php:167 +#: ../../include/features.php:177 msgid "Smart Birthdays" msgstr "Cumpleaños inteligentes" -#: ../../include/features.php:168 +#: ../../include/features.php:178 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo." -#: ../../include/features.php:176 +#: ../../include/features.php:186 msgid "Event Timezone Selection" msgstr "Selección del huso horario del evento" -#: ../../include/features.php:177 +#: ../../include/features.php:187 msgid "Allow event creation in timezones other than your own." msgstr "Permitir la creación de eventos en husos horarios distintos del suyo." -#: ../../include/features.php:185 +#: ../../include/features.php:195 msgid "Advanced Directory Search" msgstr "Búsqueda avanzada en el directorio" -#: ../../include/features.php:186 +#: ../../include/features.php:196 msgid "Allows creation of complex directory search queries" msgstr "Permitir la creación de consultas complejas en las búsquedas en el directorio" -#: ../../include/features.php:194 +#: ../../include/features.php:204 msgid "Advanced Theme and Layout Settings" msgstr "Ajustes avanzados de temas y esquemas" -#: ../../include/features.php:195 +#: ../../include/features.php:205 msgid "Allows fine tuning of themes and page layouts" msgstr "Permitir el ajuste fino de temas y esquemas de páginas" -#: ../../include/features.php:205 +#: ../../include/features.php:215 msgid "Post Composition Features" msgstr "Opciones para la redacción de entradas" -#: ../../include/features.php:209 +#: ../../include/features.php:219 msgid "Large Photos" msgstr "Fotos de gran tamaño" -#: ../../include/features.php:210 +#: ../../include/features.php:220 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)" -#: ../../include/features.php:219 +#: ../../include/features.php:229 msgid "Automatically import channel content from other channels or feeds" msgstr "Importar automáticamente contenido de otros canales o \"feeds\"" -#: ../../include/features.php:227 +#: ../../include/features.php:237 msgid "Even More Encryption" msgstr "Más cifrado todavía" -#: ../../include/features.php:228 +#: ../../include/features.php:238 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida." -#: ../../include/features.php:236 +#: ../../include/features.php:246 msgid "Enable Voting Tools" msgstr "Permitir entradas con votación" -#: ../../include/features.php:237 +#: ../../include/features.php:247 msgid "Provide a class of post which others can vote on" msgstr "Proveer una clase de publicación en la que otros puedan votar" -#: ../../include/features.php:245 +#: ../../include/features.php:255 msgid "Disable Comments" msgstr "Deshabilitar comentarios" -#: ../../include/features.php:246 +#: ../../include/features.php:256 msgid "Provide the option to disable comments for a post" msgstr "Proporcionar la opción de desactivar los comentarios para una entrada" -#: ../../include/features.php:254 +#: ../../include/features.php:264 msgid "Delayed Posting" msgstr "Publicación aplazada" -#: ../../include/features.php:255 +#: ../../include/features.php:265 msgid "Allow posts to be published at a later date" msgstr "Permitir mensajes que se publicarán en una fecha posterior" -#: ../../include/features.php:263 +#: ../../include/features.php:273 msgid "Content Expiration" msgstr "Caducidad del contenido" -#: ../../include/features.php:264 +#: ../../include/features.php:274 msgid "Remove posts/comments and/or private messages at a future time" msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante" -#: ../../include/features.php:272 +#: ../../include/features.php:282 msgid "Suppress Duplicate Posts/Comments" msgstr "Prevenir entradas o comentarios duplicados" -#: ../../include/features.php:273 +#: ../../include/features.php:283 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo." -#: ../../include/features.php:284 +#: ../../include/features.php:294 msgid "Network and Stream Filtering" msgstr "Filtrado del contenido" -#: ../../include/features.php:288 +#: ../../include/features.php:298 msgid "Search by Date" msgstr "Buscar por fecha" -#: ../../include/features.php:289 +#: ../../include/features.php:299 msgid "Ability to select posts by date ranges" msgstr "Capacidad de seleccionar entradas por rango de fechas" -#: ../../include/features.php:297 ../../include/group.php:332 +#: ../../include/features.php:307 ../../include/group.php:328 msgid "Privacy Groups" msgstr "Grupos de canales" -#: ../../include/features.php:298 +#: ../../include/features.php:308 msgid "Enable management and selection of privacy groups" msgstr "Activar la gestión y selección de grupos de canales" -#: ../../include/features.php:307 +#: ../../include/features.php:317 msgid "Save search terms for re-use" msgstr "Guardar términos de búsqueda para su reutilización" -#: ../../include/features.php:315 +#: ../../include/features.php:325 msgid "Network Personal Tab" msgstr "Actividad personal" -#: ../../include/features.php:316 +#: ../../include/features.php:326 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado." -#: ../../include/features.php:324 +#: ../../include/features.php:334 msgid "Network New Tab" msgstr "Contenido nuevo" -#: ../../include/features.php:325 +#: ../../include/features.php:335 msgid "Enable tab to display all new Network activity" msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo" -#: ../../include/features.php:333 +#: ../../include/features.php:343 msgid "Affinity Tool" msgstr "Herramienta de afinidad" -#: ../../include/features.php:334 +#: ../../include/features.php:344 msgid "Filter stream activity by depth of relationships" msgstr "Filtrar el contenido según la profundidad de las relaciones" -#: ../../include/features.php:343 +#: ../../include/features.php:353 msgid "Show friend and connection suggestions" msgstr "Mostrar sugerencias de amigos y conexiones" -#: ../../include/features.php:351 +#: ../../include/features.php:361 msgid "Connection Filtering" msgstr "Filtrado de conexiones" -#: ../../include/features.php:352 +#: ../../include/features.php:362 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido" -#: ../../include/features.php:364 +#: ../../include/features.php:374 msgid "Post/Comment Tools" msgstr "Gestión de entradas y comentarios" -#: ../../include/features.php:368 +#: ../../include/features.php:379 +msgid "Use markdown for editing posts" +msgstr "Usar markdown para editar las entradas" + +#: ../../include/features.php:387 msgid "Community Tagging" msgstr "Etiquetas de la comunidad" -#: ../../include/features.php:369 +#: ../../include/features.php:388 msgid "Ability to tag existing posts" msgstr "Capacidad de etiquetar entradas existentes" -#: ../../include/features.php:377 +#: ../../include/features.php:396 msgid "Post Categories" msgstr "Temas de las entradas" -#: ../../include/features.php:378 +#: ../../include/features.php:397 msgid "Add categories to your posts" msgstr "Añadir temas a sus publicaciones" -#: ../../include/features.php:386 +#: ../../include/features.php:405 msgid "Emoji Reactions" msgstr "Emoticonos \"emoji\"" -#: ../../include/features.php:387 +#: ../../include/features.php:406 msgid "Add emoji reaction ability to posts" msgstr "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas" -#: ../../include/features.php:396 +#: ../../include/features.php:415 msgid "Ability to file posts under folders" msgstr "Capacidad de archivar entradas en carpetas" -#: ../../include/features.php:404 +#: ../../include/features.php:423 msgid "Dislike Posts" msgstr "Desagrado de publicaciones" -#: ../../include/features.php:405 +#: ../../include/features.php:424 msgid "Ability to dislike posts/comments" msgstr "Capacidad de mostrar desacuerdo con el contenido de entradas y comentarios" -#: ../../include/features.php:413 +#: ../../include/features.php:432 msgid "Star Posts" msgstr "Entradas destacadas" -#: ../../include/features.php:414 +#: ../../include/features.php:433 msgid "Ability to mark special posts with a star indicator" msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella" -#: ../../include/features.php:422 +#: ../../include/features.php:441 msgid "Tag Cloud" msgstr "Nube de etiquetas" -#: ../../include/features.php:423 +#: ../../include/features.php:442 msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/features.php:434 +#: ../../include/features.php:453 msgid "Premium Channel" msgstr "Canal premium" -#: ../../include/features.php:435 +#: ../../include/features.php:454 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal" -#: ../../include/taxonomy.php:325 ../../include/taxonomy.php:346 +#: ../../include/taxonomy.php:377 ../../include/taxonomy.php:398 msgid "Tags" msgstr "Etiquetas" -#: ../../include/taxonomy.php:410 +#: ../../include/taxonomy.php:483 msgid "Keywords" msgstr "Palabras clave" -#: ../../include/taxonomy.php:431 +#: ../../include/taxonomy.php:504 msgid "have" msgstr "tener" -#: ../../include/taxonomy.php:431 +#: ../../include/taxonomy.php:504 msgid "has" msgstr "tiene" -#: ../../include/taxonomy.php:432 +#: ../../include/taxonomy.php:505 msgid "want" msgstr "quiero" -#: ../../include/taxonomy.php:432 +#: ../../include/taxonomy.php:505 msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:433 +#: ../../include/taxonomy.php:506 msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:434 +#: ../../include/taxonomy.php:507 msgid "dislikes" msgstr "no gusta de" @@ -13344,283 +13479,283 @@ msgstr "Esta acción supera los límites establecidos por su plan de suscripció msgid "This action is not available under your subscription plan." msgstr "Esta acción no está disponible en su plan de suscripción." -#: ../../include/datetime.php:147 +#: ../../include/datetime.php:150 msgid "Birthday" msgstr "Cumpleaños" -#: ../../include/datetime.php:149 +#: ../../include/datetime.php:152 msgid "Age: " msgstr "Edad:" -#: ../../include/datetime.php:151 +#: ../../include/datetime.php:154 msgid "YYYY-MM-DD or MM-DD" msgstr "AAAA-MM-DD o MM-DD" -#: ../../include/datetime.php:292 +#: ../../include/datetime.php:298 msgid "less than a second ago" msgstr "hace un instante" -#: ../../include/datetime.php:310 +#: ../../include/datetime.php:316 #, php-format msgctxt "e.g. 22 hours ago, 1 minute ago" msgid "%1$d %2$s ago" msgstr "hace %1$d %2$s" -#: ../../include/datetime.php:321 +#: ../../include/datetime.php:327 msgctxt "relative_date" msgid "year" msgid_plural "years" msgstr[0] "año" msgstr[1] "años" -#: ../../include/datetime.php:324 +#: ../../include/datetime.php:330 msgctxt "relative_date" msgid "month" msgid_plural "months" msgstr[0] "mes" msgstr[1] "meses" -#: ../../include/datetime.php:327 +#: ../../include/datetime.php:333 msgctxt "relative_date" msgid "week" msgid_plural "weeks" msgstr[0] "semana" msgstr[1] "semanas" -#: ../../include/datetime.php:330 +#: ../../include/datetime.php:336 msgctxt "relative_date" msgid "day" msgid_plural "days" msgstr[0] "día" msgstr[1] "días" -#: ../../include/datetime.php:333 +#: ../../include/datetime.php:339 msgctxt "relative_date" msgid "hour" msgid_plural "hours" msgstr[0] "hora" msgstr[1] "horas" -#: ../../include/datetime.php:336 +#: ../../include/datetime.php:342 msgctxt "relative_date" msgid "minute" msgid_plural "minutes" msgstr[0] "minuto" msgstr[1] "minutos" -#: ../../include/datetime.php:339 +#: ../../include/datetime.php:345 msgctxt "relative_date" msgid "second" msgid_plural "seconds" msgstr[0] "segundo" msgstr[1] "segundos" -#: ../../include/datetime.php:576 +#: ../../include/datetime.php:579 #, php-format msgid "%1$s's birthday" msgstr "Cumpleaños de %1$s" -#: ../../include/datetime.php:577 +#: ../../include/datetime.php:580 #, php-format msgid "Happy Birthday %1$s" msgstr "Feliz cumpleaños %1$s" -#: ../../include/nav.php:91 +#: ../../include/nav.php:98 msgid "Remote authentication" msgstr "Acceder desde su servidor" -#: ../../include/nav.php:91 +#: ../../include/nav.php:98 msgid "Click to authenticate to your home hub" msgstr "Pulsar para identificarse en su servidor de inicio" -#: ../../include/nav.php:98 +#: ../../include/nav.php:105 msgid "Network Activity" msgstr "Actividad de la red" -#: ../../include/nav.php:100 +#: ../../include/nav.php:107 msgid "Mark all activity notifications seen" msgstr "Marcar como vistas todas las notificaciones de actividad" -#: ../../include/nav.php:102 +#: ../../include/nav.php:109 msgid "Channel home" msgstr "Mi canal" -#: ../../include/nav.php:103 +#: ../../include/nav.php:110 msgid "View your channel home" msgstr "Ver su página principal del canal" -#: ../../include/nav.php:104 +#: ../../include/nav.php:111 msgid "Mark all channel notifications seen" msgstr "Marcar todas las notificaciones del canal como leídas" -#: ../../include/nav.php:109 +#: ../../include/nav.php:116 msgid "Registrations" msgstr "Registros" -#: ../../include/nav.php:112 +#: ../../include/nav.php:119 msgid "Notifications" msgstr "Notificaciones" -#: ../../include/nav.php:113 +#: ../../include/nav.php:120 msgid "View all notifications" msgstr "Ver todas las notificaciones" -#: ../../include/nav.php:114 +#: ../../include/nav.php:121 msgid "Mark all system notifications seen" msgstr "Marcar todas las notificaciones del sistema como leídas" -#: ../../include/nav.php:116 +#: ../../include/nav.php:123 msgid "Private mail" msgstr "Correo privado" -#: ../../include/nav.php:117 +#: ../../include/nav.php:124 msgid "View your private messages" msgstr "Ver sus mensajes privados" -#: ../../include/nav.php:118 +#: ../../include/nav.php:125 msgid "Mark all private messages seen" msgstr "Marcar todos los mensajes privados como leídos" -#: ../../include/nav.php:124 +#: ../../include/nav.php:131 msgid "Event Calendar" msgstr "Calendario de eventos" -#: ../../include/nav.php:129 ../../include/nav.php:215 +#: ../../include/nav.php:136 ../../include/nav.php:222 msgid "Manage Your Channels" msgstr "Gestionar sus canales" -#: ../../include/nav.php:132 ../../include/nav.php:217 +#: ../../include/nav.php:139 ../../include/nav.php:224 msgid "Account/Channel Settings" msgstr "Ajustes de cuenta/canales" -#: ../../include/nav.php:138 ../../include/nav.php:167 +#: ../../include/nav.php:145 ../../include/nav.php:174 msgid "End this session" msgstr "Finalizar esta sesión" -#: ../../include/nav.php:141 +#: ../../include/nav.php:148 msgid "Your profile page" msgstr "Su página del perfil" -#: ../../include/nav.php:144 +#: ../../include/nav.php:151 msgid "Manage/Edit profiles" msgstr "Administrar/editar perfiles" -#: ../../include/nav.php:146 +#: ../../include/nav.php:153 msgid "Edit your profile" msgstr "Editar su perfil" -#: ../../include/nav.php:153 ../../include/nav.php:157 +#: ../../include/nav.php:160 ../../include/nav.php:164 msgid "Sign in" msgstr "Acceder" -#: ../../include/nav.php:182 +#: ../../include/nav.php:189 msgid "Take me home" msgstr "Volver a la página principal" -#: ../../include/nav.php:184 +#: ../../include/nav.php:191 msgid "Log me out of this site" msgstr "Salir de este sitio" -#: ../../include/nav.php:189 +#: ../../include/nav.php:196 msgid "Create an account" msgstr "Crear una cuenta" -#: ../../include/nav.php:201 +#: ../../include/nav.php:208 msgid "Help and documentation" msgstr "Ayuda y documentación" -#: ../../include/nav.php:204 +#: ../../include/nav.php:211 msgid "Search site @name, #tag, ?docs, content" msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido" -#: ../../include/nav.php:224 +#: ../../include/nav.php:231 msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:311 +#: ../../include/nav.php:322 msgid "@name, #tag, ?doc, content" msgstr "@nombre, #etiqueta, ?ayuda, contenido" -#: ../../include/nav.php:312 +#: ../../include/nav.php:323 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:318 +#: ../../include/nav.php:329 msgid "Add Apps" msgstr "Añadir aplicaciones" -#: ../../include/nav.php:319 +#: ../../include/nav.php:330 msgid "Arrange Apps" msgstr "Organizar aplicaciones" -#: ../../include/nav.php:320 +#: ../../include/nav.php:331 msgid "Toggle System Apps" msgstr "Alternar aplicaciones de sistema" -#: ../../include/photos.php:123 +#: ../../include/photos.php:150 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "La imagen excede el límite de %lu bytes del sitio" -#: ../../include/photos.php:130 +#: ../../include/photos.php:161 msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:268 +#: ../../include/photos.php:322 msgid "Photo storage failed." msgstr "La foto no ha podido ser guardada." -#: ../../include/photos.php:308 +#: ../../include/photos.php:364 msgid "a new photo" msgstr "una nueva foto" -#: ../../include/photos.php:312 +#: ../../include/photos.php:368 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/photos.php:605 +#: ../../include/photos.php:660 msgid "Upload New Photos" msgstr "Subir nuevas fotos" -#: ../../include/zot.php:654 +#: ../../include/zot.php:675 msgid "Invalid data packet" msgstr "Paquete de datos no válido" -#: ../../include/zot.php:681 +#: ../../include/zot.php:702 msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la firma del canal" -#: ../../include/zot.php:2368 +#: ../../include/zot.php:2409 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/group.php:26 +#: ../../include/group.php:22 msgid "" "A deleted group with this name was revived. Existing item permissions " "may apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "Un grupo suprimido con este nombre ha sido restablecido. Es posible que los permisos existentes sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente." -#: ../../include/group.php:268 +#: ../../include/group.php:264 msgid "Add new connections to this privacy group" msgstr "Añadir conexiones nuevas a este grupo de canales" -#: ../../include/group.php:310 +#: ../../include/group.php:306 msgid "edit" msgstr "editar" -#: ../../include/group.php:333 +#: ../../include/group.php:329 msgid "Edit group" msgstr "Editar grupo" -#: ../../include/group.php:334 +#: ../../include/group.php:330 msgid "Add privacy group" msgstr "Añadir un grupo de canales" -#: ../../include/group.php:335 +#: ../../include/group.php:331 msgid "Channels not in any privacy group" msgstr "Sin canales en ningún grupo" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index f5cfecb5a..b3714d087 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -71,6 +71,9 @@ App::$strings["2. Enter my \$Projectname network address into the site searchbar App::$strings["or visit"] = "o visitar"; App::$strings["3. Click [Connect]"] = "3. Pulse [conectar]"; App::$strings["Submit"] = "Enviar"; +App::$strings["Cards"] = "Fichas"; +App::$strings["Add Article"] = "Añadir un artículo"; +App::$strings["Articles"] = "Artículos"; App::$strings["Item not found"] = "Elemento no encontrado"; App::$strings["Layout Name"] = "Nombre de la plantilla"; App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)"; @@ -148,6 +151,7 @@ App::$strings["You may also export your posts and conversations for a particular App::$strings["To select all posts for a given year, such as this year, visit %2\$s"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite %2\$s"; App::$strings["To select all posts for a given month, such as January of this year, visit %2\$s"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite %2\$s"; App::$strings["These content files may be imported or restored by visiting %2\$s on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando %2\$s o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."; +App::$strings["Welcome to hubzilla!"] = "¡Bienvenido o bienvenida a Hubzilla!"; App::$strings["Public access denied."] = "Acceso público denegado."; App::$strings["Search"] = "Buscar"; App::$strings["Items tagged with: %s"] = "elementos etiquetados con: %s"; @@ -165,8 +169,10 @@ App::$strings["Sync Now"] = "Sincronizar ahora"; App::$strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas."; App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal."; App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."; -App::$strings["Change Order of Navigation Apps"] = "Cambiar el orden de las aplicaciones en la barra de navegación"; -App::$strings["Use arrows to move the corresponding app up or down in the display list"] = "Utilizar las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la lista de visualización"; +App::$strings["Change Order of Pinned Navbar Apps"] = "Cambiar el orden de las aplicaciones fijas en la barra de navegación"; +App::$strings["Change Order of App Tray Apps"] = "Cambiar el orden de las aplicaciones de la bandeja de aplicaciones"; +App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "Use las flechas para mover la aplicación correspondiente a la izquierda (arriba) o derecha (abajo) en la barra de navegación."; +App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Use las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la bandeja de aplicaciones."; App::$strings["Menu not found."] = "Menú no encontrado"; App::$strings["Unable to create element."] = "No se puede crear el elemento."; App::$strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú."; @@ -253,6 +259,10 @@ App::$strings["photo"] = "foto"; App::$strings["status"] = "el mensaje de estado"; App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s de %2\$s"; App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha dejado de seguir %3\$s de %2\$s"; +App::$strings["Channel not found."] = "Canal no encontrado."; +App::$strings["Insert web link"] = "Insertar enlace web"; +App::$strings["Title (optional)"] = "Título (opcional)"; +App::$strings["Edit Article"] = "Editar el artículo"; App::$strings["Nothing to import."] = "No hay nada para importar."; App::$strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor"; App::$strings["Imported file is empty."] = "El fichero importado está vacío."; @@ -582,10 +592,14 @@ App::$strings["Delivery interval"] = "Intervalo de entrega"; App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."; App::$strings["Deliveries per process"] = "Intentos de envío por proceso"; App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."; +App::$strings["Queue Threshold"] = "Umbral de la cola de espera"; +App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = "Aplazar siempre la entrega inmediata si la cola contiene más de este número de entradas."; App::$strings["Poll interval"] = "Intervalo máximo de tiempo entre dos mensajes sucesivos"; App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."; App::$strings["Path to ImageMagick convert program"] = "Ruta al programa de conversión de ImageMagick"; App::$strings["If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"] = "Si está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert"; +App::$strings["Allow SVG thumbnails in file browser"] = "Permitir miniaturas SVG en el navegador de archivos"; +App::$strings["WARNING: SVG images may contain malicious code."] = "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso."; App::$strings["Maximum Load Average"] = "Carga media máxima"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."; App::$strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)"; @@ -699,6 +713,7 @@ App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amist App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam"; App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; +App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; App::$strings["Channel permissions category:"] = "Categoría de los permisos del canal:"; App::$strings["Default Permissions Group"] = "Grupo de permisos predeterminados"; App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:"; @@ -734,6 +749,8 @@ App::$strings["New connections"] = "Nuevas conexiones"; App::$strings["System Registrations"] = "Registros del sistema"; App::$strings["Unseen shared files"] = "Ficheros compartidos no vistos"; App::$strings["Unseen public activity"] = "Actividad pública no vista"; +App::$strings["Email notification hub (hostname)"] = "Email de notificación del hub (nombre del host)"; +App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s"; App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"; App::$strings["Notify me of events this many days in advance"] = "Avisarme de los eventos con algunos días de antelación"; App::$strings["Must be greater than 0"] = "Debe ser mayor que 0"; @@ -799,6 +816,8 @@ App::$strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, si App::$strings["Maximum number of conversations to load at any time:"] = "Máximo número de conversaciones a cargar en cualquier momento:"; App::$strings["Maximum of 100 items"] = "Máximo de 100 elementos"; App::$strings["Show emoticons (smilies) as images"] = "Mostrar emoticonos (smilies) como imágenes"; +App::$strings["Provide channel menu in navigation bar"] = "Proporcionar un menú de canales en la barra de navegación"; +App::$strings["Default: channel menu located in app menu"] = "Predeterminado: menú de canales ubicado en el menú de aplicaciones"; App::$strings["Manual conversation updates"] = "Actualizaciones manuales de la conversación"; App::$strings["Default is on, turning this off may increase screen jumping"] = "El valor predeterminado está activado, al desactivarlo puede aumentar el salto de pantalla"; App::$strings["Link post titles to source"] = "Enlazar título de la publicación a la fuente original"; @@ -866,7 +885,6 @@ App::$strings["Authentication failed."] = "Falló la autenticación."; App::$strings["Remote Authentication"] = "Acceso desde su servidor"; App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"; App::$strings["Authenticate"] = "Acceder"; -App::$strings["Channel not found."] = "Canal no encontrado."; App::$strings["Permissions denied."] = "Permisos denegados."; App::$strings["Import"] = "Importar"; App::$strings["Authorize application connection"] = "Autorizar una conexión de aplicación"; @@ -874,8 +892,6 @@ App::$strings["Return to your app and insert this Security Code:"] = "Vuelva a s App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar."; App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?"; App::$strings["Item not available."] = "Elemento no disponible"; -App::$strings["Insert web link"] = "Insertar enlace web"; -App::$strings["Title (optional)"] = "Título (opcional)"; App::$strings["Edit Block"] = "Modificar este bloque"; App::$strings["vcard"] = "vcard"; App::$strings["Apps"] = "Aplicaciones (apps)"; @@ -1047,6 +1063,7 @@ App::$strings["Layout not found."] = "Plantilla no encontrada"; App::$strings["Module Name:"] = "Nombre del módulo:"; App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página"; App::$strings["Edit another layout"] = "Editar otro diseño"; +App::$strings["System layout"] = "Diseño del sistema"; App::$strings["Poke"] = "Toques y otras cosas"; App::$strings["Poke somebody"] = "Dar un toque a alguien"; App::$strings["Poke/Prod"] = "Toque/Incitación"; @@ -1210,12 +1227,17 @@ App::$strings["Help"] = "Ayuda"; App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche"; App::$strings["Layout Description"] = "Descripción de la plantilla"; App::$strings["Download PDL file"] = "Descargar el fichero PDL"; +App::$strings["Unknown error"] = "Error desconocido"; +App::$strings["Post not found."] = "Mensaje no encontrado."; App::$strings["post"] = "la entrada"; App::$strings["comment"] = "el comentario"; App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3\$s de %2\$s con %4\$s"; App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."; App::$strings["Configuration Editor"] = "Editor de configuración"; App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."; +App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención."; +App::$strings["Automatic approval settings"] = "Opciones de autorización automática"; +App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Es posible que se hayan preestablecido o bloqueado algunos permisos individuales según el tipo de canal y la configuración de privacidad."; App::$strings["Privacy group created."] = "El grupo de canales ha sido creado."; App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales"; App::$strings["Privacy group not found."] = "Grupo de canales no encontrado."; @@ -1308,7 +1330,6 @@ App::$strings["Make Default"] = "Convertir en predeterminado"; App::$strings["%d new messages"] = "%d mensajes nuevos"; App::$strings["%d new introductions"] = "%d nuevas solicitudes de conexión"; App::$strings["Delegated Channel"] = "Canal delegado"; -App::$strings["Cards"] = "Fichas"; App::$strings["Add Card"] = "Añadir una ficha"; App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso"; App::$strings["About this site"] = "Acerca de este sitio"; @@ -1415,7 +1436,7 @@ App::$strings["Connect"] = "Conectar"; App::$strings["Public Forum:"] = "Foro público:"; App::$strings["Keywords: "] = "Palabras clave:"; App::$strings["Don't suggest"] = "No sugerir:"; -App::$strings["Common connections:"] = "Conexiones comunes:"; +App::$strings["Common connections (estimated):"] = "Conexiones comunes (estimadas): "; App::$strings["Global Directory"] = "Directorio global:"; App::$strings["Local Directory"] = "Directorio local:"; App::$strings["Finding:"] = "Encontrar:"; @@ -1484,6 +1505,7 @@ App::$strings["Maximum daily site registrations exceeded. Please try again tomor App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."; App::$strings["Passwords do not match."] = "Las contraseñas no coinciden."; App::$strings["Registration successful. Please check your email for validation instructions."] = "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo."; +App::$strings["Registration successful. Continue to create your first channel..."] = "Registro exitoso. Continúe creando tu primer canal..."; App::$strings["Your registration is pending approval by the site owner."] = "Su registro está pendiente de aprobación por el propietario del sitio."; App::$strings["Your registration can not be processed."] = "Su registro no puede ser procesado."; App::$strings["Registration on this hub is disabled."] = "El registro está deshabilitado en este sitio."; @@ -1491,7 +1513,7 @@ App::$strings["Registration on this hub is by approval only."] = "El registro en App::$strings["Register at another affiliated hub."] = "Registrarse en otro hub afiliado."; App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana."; App::$strings["I accept the %s for this website"] = "Acepto los %s de este sitio"; -App::$strings["I am over 13 years of age and accept the %s for this website"] = "Tengo más de 13 años de edad y acepto los %s de este sitio"; +App::$strings["I am over %s years of age and accept the %s for this website"] = "Tengo más de %s años de edad y acepto los %s de este sitio web"; App::$strings["Your email address"] = "Su dirección de correo electrónico"; App::$strings["Choose a password"] = "Elija una contraseña"; App::$strings["Please re-enter your password"] = "Por favor, vuelva a escribir su contraseña"; @@ -1516,6 +1538,7 @@ App::$strings["Developers"] = "Desarrolladores"; App::$strings["Tutorials"] = "Tutoriales"; App::$strings["\$Projectname Documentation"] = "Documentación de \$Projectname"; App::$strings["Contents"] = "Contenidos"; +App::$strings["Article"] = "Artículo"; App::$strings["Item has been removed."] = "Se ha eliminado el elemento."; App::$strings["Tag removed"] = "Etiqueta eliminada."; App::$strings["Remove Item Tag"] = "Eliminar etiqueta del elemento."; @@ -1617,6 +1640,8 @@ App::$strings["Purchase"] = "Comprar"; App::$strings["Undelete"] = "Recuperar"; App::$strings["Add to app-tray"] = "Añadir a la bandeja de aplicaciones"; App::$strings["Remove from app-tray"] = "Quitar de la bandeja de aplicaciones"; +App::$strings["Pin to navbar"] = "Fijar en la barra de navegación"; +App::$strings["Unpin from navbar"] = "Quitar de la barra de navegación"; App::$strings["__ctx:permcat__ default"] = "por defecto"; App::$strings["__ctx:permcat__ follower"] = "seguidor"; App::$strings["__ctx:permcat__ contributor"] = "contribuidor"; @@ -1772,7 +1797,6 @@ App::$strings["Shared"] = "Compartido"; App::$strings["You are using %1\$s of your available file storage."] = "Está usando %1\$s de su espacio disponible para ficheros."; App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s%)"] = "Está usando %1\$s de %2\$s que tiene a su disposición para ficheros. (%3\$s%)"; App::$strings["WARNING:"] = "ATENCIÓN: "; -App::$strings["Please use DAV to upload large (video, audio) files.
See Cloud Desktop Clients"] = "Por favor, use DAV para subir ficheros de gran tamaño (vídeo, audio).
Mire en Cloud Desktop Clients"; App::$strings["Create new folder"] = "Crear nueva carpeta"; App::$strings["Upload file"] = "Subir fichero"; App::$strings["Drop files here to immediately upload"] = "Arrastre los ficheros aquí para subirlos de forma inmediata"; @@ -1802,6 +1826,8 @@ App::$strings["Events Tools"] = "Gestión de eventos"; App::$strings["Export Calendar"] = "Exportar el calendario"; App::$strings["Import Calendar"] = "Importar un calendario"; App::$strings["Suggested Chatrooms"] = "Salas de chat sugeridas"; +App::$strings["HQ Control Panel"] = "Panel de control de HQ"; +App::$strings["Create a new post"] = "Crear una nueva entrada"; App::$strings["Private Mail Menu"] = "Menú de correo privado"; App::$strings["Combined View"] = "Vista combinada"; App::$strings["Inbox"] = "Bandeja de entrada"; @@ -1830,8 +1856,8 @@ App::$strings["Remove term"] = "Eliminar término"; App::$strings["Saved Searches"] = "Búsquedas guardadas"; App::$strings["add"] = "añadir"; App::$strings["Notes"] = "Notas"; -App::$strings["Wiki Pages"] = "Páginas del wiki"; App::$strings["Add new page"] = "Añadir una nueva página"; +App::$strings["Wiki Pages"] = "Páginas del wiki"; App::$strings["Page name"] = "Nombre de la página"; App::$strings["Refresh"] = "Recargar"; App::$strings["Tasks"] = "Tareas"; @@ -1859,6 +1885,7 @@ App::$strings["New Network Activity"] = "Nueva actividad en la red"; App::$strings["New Network Activity Notifications"] = "Avisos de nueva actividad en la red"; App::$strings["View your network activity"] = "Ver su actividad en la red"; App::$strings["Mark all notifications read"] = "Marcar todas las notificaciones como leídas"; +App::$strings["Show new posts only"] = "Mostrar solo las entradas nuevas"; App::$strings["New Home Activity"] = "Nueva actividad en su página principal"; App::$strings["New Home Activity Notifications"] = "Avisos de nueva actividad en su página principal"; App::$strings["View your home activity"] = "Ver su actividad en su página principal"; @@ -1882,7 +1909,7 @@ App::$strings["New Registrations"] = "Registros nuevos"; App::$strings["New Registrations Notifications"] = "Notificaciones de nuevos registros"; App::$strings["Public Stream Notifications"] = "Avisos del \"stream\" público"; App::$strings["View the public stream"] = "Ver el \"stream\" público"; -App::$strings["Loading..."] = "Cargando..."; +App::$strings["Loading"] = "Cargando"; App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen."; App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones"; App::$strings["Logout"] = "Finalizar sesión"; @@ -2013,23 +2040,12 @@ App::$strings["InsaneJournal password"] = "Contraseña en InsaneJournal"; App::$strings["Post to InsaneJournal by default"] = "Publicar por defecto en InsaneJournal"; App::$strings["InsaneJournal Post Settings"] = "Ajustes de publicación en InsaneJournal"; App::$strings["Insane Journal Settings saved."] = "Se han guardado los ajustes de InsaneJournal."; -App::$strings["Upload a file"] = "Subir un fichero"; -App::$strings["Drop files here to upload"] = "Arrastre los ficheros aquí para subirlos"; -App::$strings["Failed"] = "Ha fallado"; -App::$strings["No files were uploaded."] = "No se han subido ficheros."; -App::$strings["Uploaded file is empty"] = "El fichero subido está vacío"; -App::$strings["Image exceeds size limit of "] = "La imagen supera el límite de tamaño de "; -App::$strings["File has an invalid extension, it should be one of "] = "El fichero tiene una extensión no válida, debería ser una de estas: "; -App::$strings["Upload was cancelled, or server error encountered"] = "Se canceló la carga o se encontró un error del servidor"; App::$strings["Post to Dreamwidth"] = "Publicar en Dreamwidth"; App::$strings["Enable Dreamwidth Post Plugin"] = "Activar el plugin de publicación en Dreamwidth"; App::$strings["Dreamwidth username"] = "Nombre de usuario en Dreamwidth"; App::$strings["Dreamwidth password"] = "Contraseña en Dreamwidth"; App::$strings["Post to Dreamwidth by default"] = "Publicar en Dreamwidth de forma predeterminada"; App::$strings["Dreamwidth Post Settings"] = "Ajustes de publicación en Dreamwidth"; -App::$strings["Install Firefox Sharing Tools"] = "Instalar las herramientas de compartición de Firefox"; -App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contenido desde Firefox a \$Projectname"; -App::$strings["Install Firefox Sharing Tools to this web browser"] = "Instalar las herramientas de compartición de Firefox en este navegador"; App::$strings["Hubzilla Directory Stats"] = "Estadísticas de directorio de Hubzilla"; App::$strings["Total Hubs"] = "Número total de servidores"; App::$strings["Hubzilla Hubs"] = "Servidores (hubs) de Hubzilla"; @@ -2044,10 +2060,6 @@ App::$strings["Average Age"] = "Promedio de edad"; App::$strings["Known Chatrooms"] = "Salas de chat conocidas"; App::$strings["Known Tags"] = "Etiquetas conocidas"; App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = "Tenga en cuenta que las estadísticas de Diaspora y Friendica se refieren únicamente a aquellas de las que **este directorio** es consciente, y no a todos los conocidos en la red. Esto también es aplicable a las salas de chat,"; -App::$strings["Email notification hub"] = "Notificación por correo electrónico del hub"; -App::$strings["Hostname"] = "Nombre del host"; -App::$strings["Mailhost Settings"] = "Ajustes de Mailhost"; -App::$strings["MAILHOST Settings saved."] = "Se han guardado los ajustes de MAILHOST."; App::$strings["Your Webbie:"] = "Su webbie: "; App::$strings["Fontsize (px):"] = "Tamaño de fuente (px): "; App::$strings["Link:"] = "Enlace: "; @@ -2175,6 +2187,11 @@ App::$strings["Select default avatar image if none was found at Gravatar. See RE App::$strings["Rating of images"] = "Valoración de las imágenes"; App::$strings["Select the appropriate avatar rating for your site. See README"] = "Seleccione la valoración adecuada del avatar para su sitio. Ver README"; App::$strings["Gravatar settings updated."] = "Se han actualizado los ajustes de Gravatar."; +App::$strings["Hubzilla File Storage Import"] = "Importar del depósito de ficheros de Hubzilla"; +App::$strings["This will import all your cloud files from another server."] = "Esto importará todos sus ficheros en la nube desde otro servidor."; +App::$strings["Hubzilla Server base URL"] = "URL base del servidor Hubzilla"; +App::$strings["Since modified date yyyy-mm-dd"] = "Modificado desde la fecha yyyy-mm-dd"; +App::$strings["Until modified date yyyy-mm-dd"] = "Modificado hasta la fecha yyyy-mm-dd"; App::$strings["Recent Channel/Profile Viewers"] = "Visitantes recientes del canal o perfil"; App::$strings["This plugin/addon has not been configured."] = "El plugin o complemento no se ha configurado."; App::$strings["Please visit the Visage settings on %s"] = "Por favor, revise los ajustes de Visage en %s"; @@ -2255,6 +2272,8 @@ App::$strings["ActivityPub"] = "ActivityPub"; App::$strings["ActivityPub Protocol Settings updated."] = "Se han actualizado los ajustes del protocolo ActivityPub."; App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos."; App::$strings["Enable the ActivityPub protocol for this channel"] = "Activar el protocolo ActivityPub para este canal"; +App::$strings["Send multi-media HTML articles"] = "Enviar artículos multimedia en HTML"; +App::$strings["Not supported by some microblog services such as Mastodon"] = "No soportado por algunos servicios de microblog como Mastodon"; App::$strings["ActivityPub Protocol Settings"] = "Ajustes del protocolo ActivityPub"; App::$strings["Project Servers and Resources"] = "Servidores y recursos del proyecto"; App::$strings["Project Creator and Tech Lead"] = "Creador del proyecto y director técnico"; @@ -2440,7 +2459,7 @@ App::$strings["in lust"] = "lujurioso/a"; App::$strings["naked"] = "desnudo/a"; App::$strings["stinky"] = "apestoso/a"; App::$strings["sweaty"] = "sudoroso/a"; -App::$strings["bleeding out"] = "una maldición"; +App::$strings["bleeding out"] = "exánime"; App::$strings["victorious"] = "victorioso/a"; App::$strings["defeated"] = "derrotado/a"; App::$strings["envious"] = "envidioso/a"; @@ -2542,6 +2561,8 @@ App::$strings["Uncertain"] = "Indeterminado"; App::$strings["It's complicated"] = "Es complicado"; App::$strings["Don't care"] = "No me importa"; App::$strings["Ask me"] = "Pregúnteme"; +App::$strings["likes %1\$s's %2\$s"] = "gusta de %2\$s de %1\$s"; +App::$strings["doesn't like %1\$s's %2\$s"] = "no gusta de %2\$s de %1\$s"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s"; App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s"; App::$strings["poked"] = "ha dado un toque a"; @@ -2550,6 +2571,7 @@ App::$strings["Categories:"] = "Temas:"; App::$strings["Filed under:"] = "Archivado bajo:"; App::$strings["View in context"] = "Mostrar en su contexto"; App::$strings["remove"] = "eliminar"; +App::$strings["Loading..."] = "Cargando..."; App::$strings["Delete Selected Items"] = "Eliminar elementos seleccionados"; App::$strings["View Source"] = "Ver el código fuente de la entrada"; App::$strings["Follow Thread"] = "Seguir este hilo"; @@ -2606,6 +2628,8 @@ App::$strings["Files and Storage"] = "Ficheros y repositorio"; App::$strings["Bookmarks"] = "Marcadores"; App::$strings["Saved Bookmarks"] = "Marcadores guardados"; App::$strings["View Cards"] = "Ver las fichas"; +App::$strings["articles"] = "artículos"; +App::$strings["View Articles"] = "Ver los artículos"; App::$strings["View Webpages"] = "Ver páginas web"; App::$strings["__ctx:noun__ Attending"] = array( 0 => "Participaré", @@ -2919,9 +2943,10 @@ App::$strings["Post permissions %s cannot be changed %s after a post is shared.< App::$strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"; App::$strings["Image/photo"] = "Imagen/foto"; App::$strings["Encrypted content"] = "Contenido cifrado"; -App::$strings["Install %s element: "] = "Instalar el elemento %s:"; +App::$strings["Install %1\$s element %2\$s"] = "Instalar el elemento de%1\$s%2\$s"; App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."; App::$strings["card"] = "ficha"; +App::$strings["article"] = "artículo"; App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar"; App::$strings["spoiler"] = "spoiler"; App::$strings["$1 wrote:"] = "$1 escribió:"; @@ -2929,7 +2954,7 @@ App::$strings[" by "] = "por"; App::$strings[" on "] = "en"; App::$strings["Embedded content"] = "Contenido incorporado"; App::$strings["Embedding disabled"] = "Incrustación deshabilitada"; -App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$sda la bienvenida a %2\$s"; +App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s da la bienvenida a %2\$s"; App::$strings["General Features"] = "Funcionalidades básicas"; App::$strings["Multiple Profiles"] = "Múltiples perfiles"; App::$strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles"; @@ -2990,6 +3015,7 @@ App::$strings["Show friend and connection suggestions"] = "Mostrar sugerencias d App::$strings["Connection Filtering"] = "Filtrado de conexiones"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"; App::$strings["Post/Comment Tools"] = "Gestión de entradas y comentarios"; +App::$strings["Use markdown for editing posts"] = "Usar markdown para editar las entradas"; App::$strings["Community Tagging"] = "Etiquetas de la comunidad"; App::$strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes"; App::$strings["Post Categories"] = "Temas de las entradas"; -- cgit v1.2.3 From d30482197781eb8e68443e78b9f8d8727815a39a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 16 Dec 2017 20:30:42 +0100 Subject: fix undefined constant warning --- include/feedutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/feedutils.php b/include/feedutils.php index 8f2c5d988..4638ef66a 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1305,7 +1305,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { // allow likes of comments - if($item_parent_mid && activity_match($datarray['verb'],ACTVITY_LIKE)) { + if($item_parent_mid && activity_match($datarray['verb'],ACTIVITY_LIKE)) { $datarray['thr_parent'] = $item_parent_mid[0]['parent_mid']; } -- cgit v1.2.3 From 7181cf901242c75fed84920817466aff650b6848 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 16 Dec 2017 20:33:07 +0100 Subject: silence PHP7.2 warning --- include/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/message.php b/include/message.php index b57d2e068..4a673b961 100644 --- a/include/message.php +++ b/include/message.php @@ -215,7 +215,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep return $ret; } - if(count($images)) { + if($images) { foreach($images as $image) { if(! stristr($image,z_root() . '/photo/')) continue; -- cgit v1.2.3 From b1e191ce215e087c075df07e376dcacec152e398 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 16 Dec 2017 15:10:43 -0800 Subject: don't zidify all permalinks, only zot permalinks --- include/text.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index f3d522e04..02e2a10b5 100644 --- a/include/text.php +++ b/include/text.php @@ -1754,9 +1754,14 @@ function get_plink($item,$conversation_mode = true) { else $key = 'llink'; + $zidify = false; + + if(array_key_exists('author',$item) && $item['author']['xchan_network'] === 'zot') + $zidify = true; + if(x($item,$key)) { return array( - 'href' => zid($item[$key]), + 'href' => (($zidify) ? zid($item[$key]) : $item[$key]), 'title' => t('Link to Source'), ); } -- cgit v1.2.3 From 59779f2a0e397984fdf0174818969c76a3639272 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 16 Dec 2017 15:14:28 -0800 Subject: reverse the logic so we zidify by default --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 02e2a10b5..107efe0cb 100644 --- a/include/text.php +++ b/include/text.php @@ -1754,10 +1754,10 @@ function get_plink($item,$conversation_mode = true) { else $key = 'llink'; - $zidify = false; + $zidify = true; - if(array_key_exists('author',$item) && $item['author']['xchan_network'] === 'zot') - $zidify = true; + if(array_key_exists('author',$item) && $item['author']['xchan_network'] !== 'zot') + $zidify = false; if(x($item,$key)) { return array( -- cgit v1.2.3 From 7cfe4c0f0132a7048641e6fd6f26a928f12e5960 Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 17 Dec 2017 00:53:55 +0100 Subject: Update classmap caches and add phpunit/dbunit. In preparation for DB unit tests add phpunit/dbunit and update dev libraries. Update autoload classmap caches. --- composer.json | 5 +- composer.lock | 411 ++++++++++-------- vendor/composer/autoload_classmap.php | 16 +- vendor/composer/autoload_static.php | 16 +- vendor/composer/installed.json | 794 +++++++++++++++++----------------- 5 files changed, 653 insertions(+), 589 deletions(-) diff --git a/composer.json b/composer.json index d35548f94..d7d979129 100644 --- a/composer.json +++ b/composer.json @@ -40,11 +40,12 @@ }, "require-dev" : { "php" : ">=7.0", - "phpunit/phpunit" : "^6.1", + "phpunit/phpunit" : "~6.4.4", "behat/behat" : "@stable", "behat/mink-extension": "@stable", "behat/mink-goutte-driver": "@stable", - "php-mock/php-mock-phpunit": "^2.0" + "php-mock/php-mock-phpunit": "^2.0", + "phpunit/dbunit": "^3.0" }, "autoload" : { "psr-4" : { diff --git a/composer.lock b/composer.lock index bcf6b41b4..0a7db1306 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9c45792f04ea3e30f312f5eef0bdad86", + "content-hash": "3898249f4ed6128a2e7dbcd1744106be", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -868,16 +868,16 @@ "packages-dev": [ { "name": "behat/behat", - "version": "v3.4.1", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "cb51d4b0b11ea6d3897f3589a871a63a33632692" + "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/cb51d4b0b11ea6d3897f3589a871a63a33632692", - "reference": "cb51d4b0b11ea6d3897f3589a871a63a33632692", + "url": "https://api.github.com/repos/Behat/Behat/zipball/d60b161bff1b95ec4bb80bb8cb210ccf890314c2", + "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2", "shasum": "" }, "require": { @@ -887,18 +887,18 @@ "ext-mbstring": "*", "php": ">=5.3.3", "psr/container": "^1.0", - "symfony/class-loader": "~2.1||~3.0", - "symfony/config": "~2.3||~3.0", - "symfony/console": "~2.5||~3.0", - "symfony/dependency-injection": "~2.1||~3.0", - "symfony/event-dispatcher": "~2.1||~3.0", - "symfony/translation": "~2.3||~3.0", - "symfony/yaml": "~2.1||~3.0" + "symfony/class-loader": "~2.1||~3.0||~4.0", + "symfony/config": "~2.3||~3.0||~4.0", + "symfony/console": "~2.5||~3.0||~4.0", + "symfony/dependency-injection": "~2.1||~3.0||~4.0", + "symfony/event-dispatcher": "~2.1||~3.0||~4.0", + "symfony/translation": "~2.3||~3.0||~4.0", + "symfony/yaml": "~2.1||~3.0||~4.0" }, "require-dev": { "herrera-io/box": "~1.6.1", - "phpunit/phpunit": "~4.5", - "symfony/process": "~2.5|~3.0" + "phpunit/phpunit": "^4.8.36|^6.3", + "symfony/process": "~2.5|~3.0|~4.0" }, "suggest": { "behat/mink-extension": "for integration with Mink testing framework", @@ -947,7 +947,7 @@ "symfony", "testing" ], - "time": "2017-09-18T11:10:28+00:00" + "time": "2017-11-27T10:37:56+00:00" }, { "name": "behat/gherkin", @@ -1124,27 +1124,27 @@ }, { "name": "behat/mink-extension", - "version": "v2.2", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/Behat/MinkExtension.git", - "reference": "5b4bda64ff456104564317e212c823e45cad9d59" + "reference": "badc565b7a1d05c4a4bf49c789045bcf7af6c6de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59", - "reference": "5b4bda64ff456104564317e212c823e45cad9d59", + "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/badc565b7a1d05c4a4bf49c789045bcf7af6c6de", + "reference": "badc565b7a1d05c4a4bf49c789045bcf7af6c6de", "shasum": "" }, "require": { - "behat/behat": "~3.0,>=3.0.5", - "behat/mink": "~1.5", + "behat/behat": "^3.0.5", + "behat/mink": "^1.5", "php": ">=5.3.2", - "symfony/config": "~2.2|~3.0" + "symfony/config": "^2.7|^3.0|^4.0" }, "require-dev": { - "behat/mink-goutte-driver": "~1.1", - "phpspec/phpspec": "~2.0" + "behat/mink-goutte-driver": "^1.1", + "phpspec/phpspec": "^2.0" }, "type": "behat-extension", "extra": { @@ -1179,7 +1179,7 @@ "test", "web" ], - "time": "2016-02-15T07:55:18+00:00" + "time": "2017-11-24T19:30:49+00:00" }, { "name": "behat/mink-goutte-driver", @@ -1858,22 +1858,22 @@ }, { "name": "php-mock/php-mock-phpunit", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/php-mock/php-mock-phpunit.git", - "reference": "173781abdc632c59200253e12e2b991ae6a4574f" + "reference": "b42fc41ecb7538564067527f6c30b8854f149d32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/173781abdc632c59200253e12e2b991ae6a4574f", - "reference": "173781abdc632c59200253e12e2b991ae6a4574f", + "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/b42fc41ecb7538564067527f6c30b8854f149d32", + "reference": "b42fc41ecb7538564067527f6c30b8854f149d32", "shasum": "" }, "require": { "php": ">=7", "php-mock/php-mock-integration": "^2", - "phpunit/phpunit": "^6" + "phpunit/phpunit": "^6 <6.5" }, "type": "library", "autoload": { @@ -1905,7 +1905,7 @@ "test", "test double" ], - "time": "2017-02-17T22:44:38+00:00" + "time": "2017-12-02T09:49:02+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2055,33 +2055,33 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -2114,20 +2114,72 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-11-24T13:59:53+00:00" + }, + { + "name": "phpunit/dbunit", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/dbunit.git", + "reference": "403350339b6aca748ee0067d027d85621992e21f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/403350339b6aca748ee0067d027d85621992e21f", + "reference": "403350339b6aca748ee0067d027d85621992e21f", + "shasum": "" + }, + "require": { + "ext-pdo": "*", + "ext-simplexml": "*", + "php": "^7.0", + "phpunit/phpunit": "^6.0", + "symfony/yaml": "^3.0 || ^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "PHPUnit extension for database interaction testing", + "homepage": "https://github.com/sebastianbergmann/dbunit/", + "keywords": [ + "database", + "testing", + "xunit" + ], + "time": "2017-11-18T17:40:34+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b" + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8ed1902a57849e117b5651fc1a5c48110946c06b", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "shasum": "" }, "require": { @@ -2136,14 +2188,13 @@ "php": "^7.0", "phpunit/php-file-iterator": "^1.4.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^1.4.11 || ^2.0", + "phpunit/php-token-stream": "^2.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^3.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.5", "phpunit/phpunit": "^6.0" }, "suggest": { @@ -2152,7 +2203,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -2167,7 +2218,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -2178,20 +2229,20 @@ "testing", "xunit" ], - "time": "2017-08-03T12:40:43+00:00" + "time": "2017-12-06T09:29:45+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -2225,7 +2276,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -2319,16 +2370,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { @@ -2364,20 +2415,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-20T05:47:52+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", - "version": "6.4.3", + "version": "6.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13" + "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/06b28548fd2b4a20c3cd6e247dc86331a7d4db13", - "reference": "06b28548fd2b4a20c3cd6e247dc86331a7d4db13", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932", + "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932", "shasum": "" }, "require": { @@ -2448,7 +2499,7 @@ "testing", "xunit" ], - "time": "2017-10-16T13:18:59+00:00" + "time": "2017-11-08T11:26:09+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2655,30 +2706,30 @@ }, { "name": "sebastian/comparator", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a" + "reference": "1174d9018191e93cb9d719edec01257fc05f8158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158", + "reference": "1174d9018191e93cb9d719edec01257fc05f8158", "shasum": "" }, "require": { "php": "^7.0", "sebastian/diff": "^2.0", - "sebastian/exporter": "^3.0" + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -2709,13 +2760,13 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-08-03T07:14:59+00:00" + "time": "2017-11-03T07:16:52+00:00" }, { "name": "sebastian/diff", @@ -3169,25 +3220,25 @@ }, { "name": "symfony/browser-kit", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "317d5bdf0127f06db7ea294186132b4f5b036839" + "reference": "f761b4ecdd23a451c2cae6fba704d8b207cbb045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/317d5bdf0127f06db7ea294186132b4f5b036839", - "reference": "317d5bdf0127f06db7ea294186132b4f5b036839", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f761b4ecdd23a451c2cae6fba704d8b207cbb045", + "reference": "f761b4ecdd23a451c2cae6fba704d8b207cbb045", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/dom-crawler": "~2.8|~3.0" + "symfony/dom-crawler": "~2.8|~3.0|~4.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/process": "" @@ -3195,7 +3246,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3222,27 +3273,27 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-11T22:06:16+00:00" }, { "name": "symfony/class-loader", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "7572c904b209fa9907c69a6a9a68243c265a4d01" + "reference": "e8d36a7b5568d232f5c3f8ef92665836b9f1e038" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/7572c904b209fa9907c69a6a9a68243c265a4d01", - "reference": "7572c904b209fa9907c69a6a9a68243c265a4d01", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/e8d36a7b5568d232f5c3f8ef92665836b9f1e038", + "reference": "e8d36a7b5568d232f5c3f8ef92665836b9f1e038", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, "require-dev": { - "symfony/finder": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0|~4.0", "symfony/polyfill-apcu": "~1.1" }, "suggest": { @@ -3251,7 +3302,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3278,34 +3329,34 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-11-05T16:10:10+00:00" }, { "name": "symfony/config", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd" + "reference": "e57211b88aa889fefac1cb36866db04100b0f21c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd", - "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd", + "url": "https://api.github.com/repos/symfony/config/zipball/e57211b88aa889fefac1cb36866db04100b0f21c", + "reference": "e57211b88aa889fefac1cb36866db04100b0f21c", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0" + "symfony/filesystem": "~2.8|~3.0|~4.0" }, "conflict": { "symfony/dependency-injection": "<3.3", "symfony/finder": "<3.3" }, "require-dev": { - "symfony/dependency-injection": "~3.3", - "symfony/finder": "~3.3", - "symfony/yaml": "~3.0" + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/finder": "~3.3|~4.0", + "symfony/yaml": "~3.0|~4.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -3313,7 +3364,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3340,48 +3391,49 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-10-04T18:56:58+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/console", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c" + "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c", - "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c", + "url": "https://api.github.com/repos/symfony/console/zipball/9f21adfb92a9315b73ae2ed43138988ee4913d4e", + "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3408,20 +3460,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "07447650225ca9223bd5c97180fe7c8267f7d332" + "reference": "eac760b414cf1f64362c3dd047b989e4db121332" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/07447650225ca9223bd5c97180fe7c8267f7d332", - "reference": "07447650225ca9223bd5c97180fe7c8267f7d332", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/eac760b414cf1f64362c3dd047b989e4db121332", + "reference": "eac760b414cf1f64362c3dd047b989e4db121332", "shasum": "" }, "require": { @@ -3430,7 +3482,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3461,20 +3513,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/debug", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd" + "reference": "543deab3ffff94402440b326fc94153bae2dfa7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", - "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd", + "url": "https://api.github.com/repos/symfony/debug/zipball/543deab3ffff94402440b326fc94153bae2dfa7a", + "reference": "543deab3ffff94402440b326fc94153bae2dfa7a", "shasum": "" }, "require": { @@ -3485,12 +3537,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3517,20 +3569,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-12T08:27:14+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1" + "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8ebad929aee3ca185b05f55d9cc5521670821ad1", - "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", + "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", "shasum": "" }, "require": { @@ -3538,17 +3590,18 @@ "psr/container": "^1.0" }, "conflict": { - "symfony/config": "<3.3.1", + "symfony/config": "<3.3.7", "symfony/finder": "<3.3", - "symfony/yaml": "<3.3" + "symfony/proxy-manager-bridge": "<3.4", + "symfony/yaml": "<3.4" }, "provide": { "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/yaml": "~3.3" + "symfony/config": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/config": "", @@ -3560,7 +3613,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3587,20 +3640,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-10-04T17:15:30+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "40dafd42d5dad7fe5ad4e958413d92a207522ac1" + "reference": "dc847845c66fa68ad4522ed27e62b9b9dd12ab3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/40dafd42d5dad7fe5ad4e958413d92a207522ac1", - "reference": "40dafd42d5dad7fe5ad4e958413d92a207522ac1", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dc847845c66fa68ad4522ed27e62b9b9dd12ab3b", + "reference": "dc847845c66fa68ad4522ed27e62b9b9dd12ab3b", "shasum": "" }, "require": { @@ -3608,7 +3661,7 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0" + "symfony/css-selector": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -3616,7 +3669,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3643,20 +3696,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423" + "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d7ba037e4b8221956ab1e221c73c9e27e05dd423", - "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b869cbf8a15ca6261689de2c28a7d7f2d0706835", + "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835", "shasum": "" }, "require": { @@ -3667,10 +3720,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3679,7 +3732,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3706,20 +3759,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" + "reference": "25b135bea251829e3db6a77d773643408b575ed4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/25b135bea251829e3db6a77d773643408b575ed4", + "reference": "25b135bea251829e3db6a77d773643408b575ed4", "shasum": "" }, "require": { @@ -3728,7 +3781,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3755,7 +3808,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-10-03T13:33:10+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3818,16 +3871,16 @@ }, { "name": "symfony/translation", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "409bf229cd552bf7e3faa8ab7e3980b07672073f" + "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/409bf229cd552bf7e3faa8ab7e3980b07672073f", - "reference": "409bf229cd552bf7e3faa8ab7e3980b07672073f", + "url": "https://api.github.com/repos/symfony/translation/zipball/4c5d5582baf2829751a5207659329c1f52eedeb6", + "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6", "shasum": "" }, "require": { @@ -3836,13 +3889,16 @@ }, "conflict": { "symfony/config": "<2.8", - "symfony/yaml": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~3.3" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -3852,7 +3908,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3879,27 +3935,30 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" + "time": "2017-12-12T08:27:14+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.10", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" + "reference": "afe0cd38486505c9703707707d91450cfc1bd536" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", - "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", + "url": "https://api.github.com/repos/symfony/yaml/zipball/afe0cd38486505c9703707707d91450cfc1bd536", + "reference": "afe0cd38486505c9703707707d91450cfc1bd536", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, + "conflict": { + "symfony/console": "<3.4" + }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -3907,7 +3966,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3934,7 +3993,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-10-05T14:43:42+00:00" + "time": "2017-12-11T20:38:23+00:00" }, { "name": "theseer/tokenizer", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index ea7bbb286..cb5a049a9 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -839,6 +839,8 @@ return array( 'Zotlabs\\Module\\Appman' => $baseDir . '/Zotlabs/Module/Appman.php', 'Zotlabs\\Module\\Apporder' => $baseDir . '/Zotlabs/Module/Apporder.php', 'Zotlabs\\Module\\Apps' => $baseDir . '/Zotlabs/Module/Apps.php', + 'Zotlabs\\Module\\Article_edit' => $baseDir . '/Zotlabs/Module/Article_edit.php', + 'Zotlabs\\Module\\Articles' => $baseDir . '/Zotlabs/Module/Articles.php', 'Zotlabs\\Module\\Attach' => $baseDir . '/Zotlabs/Module/Attach.php', 'Zotlabs\\Module\\Authorize' => $baseDir . '/Zotlabs/Module/Authorize.php', 'Zotlabs\\Module\\Authtest' => $baseDir . '/Zotlabs/Module/Authtest.php', @@ -990,13 +992,7 @@ return array( 'Zotlabs\\Module\\Toggle_safesearch' => $baseDir . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => $baseDir . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Uexport' => $baseDir . '/Zotlabs/Module/Uexport.php', - 'Zotlabs\\Module\\Update_cards' => $baseDir . '/Zotlabs/Module/Update_cards.php', - 'Zotlabs\\Module\\Update_channel' => $baseDir . '/Zotlabs/Module/Update_channel.php', - 'Zotlabs\\Module\\Update_display' => $baseDir . '/Zotlabs/Module/Update_display.php', - 'Zotlabs\\Module\\Update_home' => $baseDir . '/Zotlabs/Module/Update_home.php', - 'Zotlabs\\Module\\Update_network' => $baseDir . '/Zotlabs/Module/Update_network.php', - 'Zotlabs\\Module\\Update_pubstream' => $baseDir . '/Zotlabs/Module/Update_pubstream.php', - 'Zotlabs\\Module\\Update_search' => $baseDir . '/Zotlabs/Module/Update_search.php', + 'Zotlabs\\Module\\Update' => $baseDir . '/Zotlabs/Module/Update.php', 'Zotlabs\\Module\\View' => $baseDir . '/Zotlabs/Module/View.php', 'Zotlabs\\Module\\Viewconnections' => $baseDir . '/Zotlabs/Module/Viewconnections.php', 'Zotlabs\\Module\\Viewsrc' => $baseDir . '/Zotlabs/Module/Viewsrc.php', @@ -1027,6 +1023,11 @@ return array( 'Zotlabs\\Storage\\File' => $baseDir . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => $baseDir . '/Zotlabs/Storage/GitRepo.php', 'Zotlabs\\Text\\Tagadelic' => $baseDir . '/Zotlabs/Text/Tagadelic.php', + 'Zotlabs\\Thumbs\\Epubthumb' => $baseDir . '/Zotlabs/Thumbs/Epubthumb.php', + 'Zotlabs\\Thumbs\\Mp3audio' => $baseDir . '/Zotlabs/Thumbs/Mp3audio.php', + 'Zotlabs\\Thumbs\\Pdf' => $baseDir . '/Zotlabs/Thumbs/Pdf.php', + 'Zotlabs\\Thumbs\\Text' => $baseDir . '/Zotlabs/Thumbs/Text.php', + 'Zotlabs\\Thumbs\\Video' => $baseDir . '/Zotlabs/Thumbs/Video.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1065,6 +1066,7 @@ return array( 'Zotlabs\\Widget\\Forums' => $baseDir . '/Zotlabs/Widget/Forums.php', 'Zotlabs\\Widget\\Fullprofile' => $baseDir . '/Zotlabs/Widget/Fullprofile.php', 'Zotlabs\\Widget\\Helpindex' => $baseDir . '/Zotlabs/Widget/Helpindex.php', + 'Zotlabs\\Widget\\Hq_controls' => $baseDir . '/Zotlabs/Widget/Hq_controls.php', 'Zotlabs\\Widget\\Item' => $baseDir . '/Zotlabs/Widget/Item.php', 'Zotlabs\\Widget\\Mailmenu' => $baseDir . '/Zotlabs/Widget/Mailmenu.php', 'Zotlabs\\Widget\\Menu_preview' => $baseDir . '/Zotlabs/Widget/Menu_preview.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 63dc8c257..4bec73479 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -991,6 +991,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Appman' => __DIR__ . '/../..' . '/Zotlabs/Module/Appman.php', 'Zotlabs\\Module\\Apporder' => __DIR__ . '/../..' . '/Zotlabs/Module/Apporder.php', 'Zotlabs\\Module\\Apps' => __DIR__ . '/../..' . '/Zotlabs/Module/Apps.php', + 'Zotlabs\\Module\\Article_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Article_edit.php', + 'Zotlabs\\Module\\Articles' => __DIR__ . '/../..' . '/Zotlabs/Module/Articles.php', 'Zotlabs\\Module\\Attach' => __DIR__ . '/../..' . '/Zotlabs/Module/Attach.php', 'Zotlabs\\Module\\Authorize' => __DIR__ . '/../..' . '/Zotlabs/Module/Authorize.php', 'Zotlabs\\Module\\Authtest' => __DIR__ . '/../..' . '/Zotlabs/Module/Authtest.php', @@ -1142,13 +1144,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Toggle_safesearch' => __DIR__ . '/../..' . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => __DIR__ . '/../..' . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Uexport' => __DIR__ . '/../..' . '/Zotlabs/Module/Uexport.php', - 'Zotlabs\\Module\\Update_cards' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_cards.php', - 'Zotlabs\\Module\\Update_channel' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_channel.php', - 'Zotlabs\\Module\\Update_display' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_display.php', - 'Zotlabs\\Module\\Update_home' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_home.php', - 'Zotlabs\\Module\\Update_network' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_network.php', - 'Zotlabs\\Module\\Update_pubstream' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_pubstream.php', - 'Zotlabs\\Module\\Update_search' => __DIR__ . '/../..' . '/Zotlabs/Module/Update_search.php', + 'Zotlabs\\Module\\Update' => __DIR__ . '/../..' . '/Zotlabs/Module/Update.php', 'Zotlabs\\Module\\View' => __DIR__ . '/../..' . '/Zotlabs/Module/View.php', 'Zotlabs\\Module\\Viewconnections' => __DIR__ . '/../..' . '/Zotlabs/Module/Viewconnections.php', 'Zotlabs\\Module\\Viewsrc' => __DIR__ . '/../..' . '/Zotlabs/Module/Viewsrc.php', @@ -1179,6 +1175,11 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Storage\\File' => __DIR__ . '/../..' . '/Zotlabs/Storage/File.php', 'Zotlabs\\Storage\\GitRepo' => __DIR__ . '/../..' . '/Zotlabs/Storage/GitRepo.php', 'Zotlabs\\Text\\Tagadelic' => __DIR__ . '/../..' . '/Zotlabs/Text/Tagadelic.php', + 'Zotlabs\\Thumbs\\Epubthumb' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Epubthumb.php', + 'Zotlabs\\Thumbs\\Mp3audio' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Mp3audio.php', + 'Zotlabs\\Thumbs\\Pdf' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Pdf.php', + 'Zotlabs\\Thumbs\\Text' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Text.php', + 'Zotlabs\\Thumbs\\Video' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Video.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1217,6 +1218,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Forums' => __DIR__ . '/../..' . '/Zotlabs/Widget/Forums.php', 'Zotlabs\\Widget\\Fullprofile' => __DIR__ . '/../..' . '/Zotlabs/Widget/Fullprofile.php', 'Zotlabs\\Widget\\Helpindex' => __DIR__ . '/../..' . '/Zotlabs/Widget/Helpindex.php', + 'Zotlabs\\Widget\\Hq_controls' => __DIR__ . '/../..' . '/Zotlabs/Widget/Hq_controls.php', 'Zotlabs\\Widget\\Item' => __DIR__ . '/../..' . '/Zotlabs/Widget/Item.php', 'Zotlabs\\Widget\\Mailmenu' => __DIR__ . '/../..' . '/Zotlabs/Widget/Mailmenu.php', 'Zotlabs\\Widget\\Menu_preview' => __DIR__ . '/../..' . '/Zotlabs/Widget/Menu_preview.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 31aa8aef4..863dfa323 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,157 +1,196 @@ [ { - "name": "sabre/event", - "version": "3.0.0", - "version_normalized": "3.0.0.0", + "name": "bshaffer/oauth2-server-php", + "version": "v1.9.0", + "version_normalized": "1.9.0.0", "source": { "type": "git", - "url": "https://github.com/sabre-io/event.git", - "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534" + "url": "https://github.com/bshaffer/oauth2-server-php.git", + "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/event/zipball/831d586f5a442dceacdcf5e9c4c36a4db99a3534", - "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534", + "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697", + "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697", "shasum": "" }, "require": { - "php": ">=5.5" + "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "*", - "sabre/cs": "~0.0.4" + "aws/aws-sdk-php": "~2.8", + "firebase/php-jwt": "~2.2", + "mongodb/mongodb": "^1.1", + "predis/predis": "dev-master", + "thobbs/phpcassa": "dev-master" }, - "time": "2015-11-05T20:14:39+00:00", + "suggest": { + "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage", + "firebase/php-jwt": "~1.1 is required to use MondoDB storage", + "predis/predis": "Required to use Redis storage", + "thobbs/phpcassa": "Required to use Cassandra storage" + }, + "time": "2017-01-06T23:20:00+00:00", "type": "library", "installation-source": "dist", "autoload": { - "psr-4": { - "Sabre\\Event\\": "lib/" - }, - "files": [ - "lib/coroutine.php", - "lib/Loop/functions.php", - "lib/Promise/functions.php" - ] + "psr-0": { + "OAuth2": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" + "name": "Brent Shaffer", + "email": "bshafs@gmail.com", + "homepage": "http://brentertainment.com" } ], - "description": "sabre/event is a library for lightweight event-based programming", - "homepage": "http://sabre.io/event/", + "description": "OAuth2 Server for PHP", + "homepage": "http://github.com/bshaffer/oauth2-server-php", "keywords": [ - "EventEmitter", - "async", - "events", - "hooks", - "plugin", - "promise", - "signal" + "auth", + "oauth", + "oauth2" ] }, { - "name": "sabre/xml", - "version": "1.5.0", - "version_normalized": "1.5.0.0", + "name": "commerceguys/intl", + "version": "v0.7.4", + "version_normalized": "0.7.4.0", "source": { "type": "git", - "url": "https://github.com/sabre-io/xml.git", - "reference": "59b20e5bbace9912607481634f97d05a776ffca7" + "url": "https://github.com/commerceguys/intl.git", + "reference": "edfcfc26ed8505c4f6fcf862eb36dfda1af74b00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/xml/zipball/59b20e5bbace9912607481634f97d05a776ffca7", - "reference": "59b20e5bbace9912607481634f97d05a776ffca7", + "url": "https://api.github.com/repos/commerceguys/intl/zipball/edfcfc26ed8505c4f6fcf862eb36dfda1af74b00", + "reference": "edfcfc26ed8505c4f6fcf862eb36dfda1af74b00", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-xmlreader": "*", - "ext-xmlwriter": "*", - "lib-libxml": ">=2.6.20", - "php": ">=5.5.5", - "sabre/uri": ">=1.0,<3.0.0" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "*", - "sabre/cs": "~1.0.0" + "mikey179/vfsstream": "1.*", + "phpunit/phpunit": "~4.0" }, - "time": "2016-10-09T22:57:52+00:00", + "time": "2016-12-13T12:33:19+00:00", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.x-dev" + } + }, "installation-source": "dist", "autoload": { "psr-4": { - "Sabre\\Xml\\": "lib/" + "CommerceGuys\\Intl\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bojan Zivanovic" + } + ], + "description": "Internationalization library powered by CLDR data." + }, + { + "name": "ezyang/htmlpurifier", + "version": "v4.9.3", + "version_normalized": "4.9.3.0", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, + "time": "2017-06-03T02:28:16+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "HTMLPurifier": "library/" }, "files": [ - "lib/Deserializer/functions.php", - "lib/Serializer/functions.php" + "library/HTMLPurifier.composer.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "LGPL" ], "authors": [ { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - }, - { - "name": "Markus Staab", - "email": "markus.staab@redaxo.de", - "role": "Developer" + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" } ], - "description": "sabre/xml is an XML library that you may not hate.", - "homepage": "https://sabre.io/xml/", + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", "keywords": [ - "XMLReader", - "XMLWriter", - "dom", - "xml" + "html" ] }, { - "name": "psr/log", - "version": "1.0.2", - "version_normalized": "1.0.2.0", + "name": "league/html-to-markdown", + "version": "4.4.1", + "version_normalized": "4.4.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "url": "https://github.com/thephpleague/html-to-markdown.git", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", + "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-dom": "*", + "ext-xml": "*", + "php": ">=5.3.3" }, - "time": "2016-10-10T12:19:37+00:00", + "require-dev": { + "mikehaertl/php-shellcommand": "~1.1.0", + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "time": "2017-03-16T00:45:59+00:00", + "bin": [ + "bin/html-to-markdown" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "4.5-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "League\\HTMLToMarkdown\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -160,16 +199,60 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "http://www.colinodell.com", + "role": "Lead Developer" + }, + { + "name": "Nick Cernis", + "email": "nick@cern.is", + "homepage": "http://modernnerd.net", + "role": "Original Author" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "An HTML-to-markdown conversion helper for PHP", + "homepage": "https://github.com/thephpleague/html-to-markdown", "keywords": [ - "log", - "psr", - "psr-3" + "html", + "markdown" + ] + }, + { + "name": "lukasreschke/id3parser", + "version": "v0.0.1", + "version_normalized": "0.0.1.0", + "source": { + "type": "git", + "url": "https://github.com/LukasReschke/ID3Parser.git", + "reference": "cd3ba6e8918cc30883f01a3c24281cfe23b8877a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LukasReschke/ID3Parser/zipball/cd3ba6e8918cc30883f01a3c24281cfe23b8877a", + "reference": "cd3ba6e8918cc30883f01a3c24281cfe23b8877a", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "time": "2016-04-04T09:34:50+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "ID3Parser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL" + ], + "homepage": "https://github.com/LukasReschke/ID3Parser/", + "keywords": [ + "codecs", + "php", + "tags" ] }, { @@ -226,189 +309,82 @@ ] }, { - "name": "bshaffer/oauth2-server-php", - "version": "v1.9.0", - "version_normalized": "1.9.0.0", + "name": "pear/text_languagedetect", + "version": "v1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/bshaffer/oauth2-server-php.git", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697" + "url": "https://github.com/pear/Text_LanguageDetect.git", + "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697", + "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6", + "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6", "shasum": "" }, - "require": { - "php": ">=5.3.9" - }, "require-dev": { - "aws/aws-sdk-php": "~2.8", - "firebase/php-jwt": "~2.2", - "mongodb/mongodb": "^1.1", - "predis/predis": "dev-master", - "thobbs/phpcassa": "dev-master" + "phpunit/phpunit": "*" }, "suggest": { - "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage", - "firebase/php-jwt": "~1.1 is required to use MondoDB storage", - "predis/predis": "Required to use Redis storage", - "thobbs/phpcassa": "Required to use Cassandra storage" + "ext-mbstring": "May require the mbstring PHP extension" }, - "time": "2017-01-06T23:20:00+00:00", + "time": "2017-03-02T16:14:08+00:00", "type": "library", "installation-source": "dist", "autoload": { "psr-0": { - "OAuth2": "src/" + "Text": "./" } }, "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brent Shaffer", - "email": "bshafs@gmail.com", - "homepage": "http://brentertainment.com" - } + "include-path": [ + "./" ], - "description": "OAuth2 Server for PHP", - "homepage": "http://github.com/bshaffer/oauth2-server-php", - "keywords": [ - "auth", - "oauth", - "oauth2" - ] - }, - { - "name": "simplepie/simplepie", - "version": "1.5", - "version_normalized": "1.5.0.0", - "source": { - "type": "git", - "url": "https://github.com/simplepie/simplepie.git", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4 || ~5" - }, - "suggest": { - "mf2/mf2": "Microformat module that allows for parsing HTML for microformats" - }, - "time": "2017-04-17T07:29:31+00:00", - "type": "library", - "installation-source": "source", - "autoload": { - "psr-0": { - "SimplePie": "library" - } - }, "license": [ - "BSD-3-Clause" + "BSD-2-Clause" ], "authors": [ { - "name": "Ryan Parman", - "homepage": "http://ryanparman.com/", - "role": "Creator, alumnus developer" - }, - { - "name": "Geoffrey Sneddon", - "homepage": "http://gsnedders.com/", - "role": "Alumnus developer" - }, - { - "name": "Ryan McCue", - "email": "me@ryanmccue.info", - "homepage": "http://ryanmccue.info/", - "role": "Developer" + "name": "Nicholas Pisarro", + "email": "taak@php.net", + "role": "Lead" } ], - "description": "A simple Atom/RSS parsing library for PHP", - "homepage": "http://simplepie.org/", - "keywords": [ - "atom", - "feeds", - "rss" - ], - "support": { - "source": "https://github.com/simplepie/simplepie/tree/1.5", - "issues": "https://github.com/simplepie/simplepie/issues" - } + "description": "Identify human languages from text samples", + "homepage": "http://pear.php.net/package/Text_LanguageDetect" }, { - "name": "sabre/dav", - "version": "3.2.2", - "version_normalized": "3.2.2.0", + "name": "sabre/uri", + "version": "1.2.1", + "version_normalized": "1.2.1.0", "source": { "type": "git", - "url": "https://github.com/sabre-io/dav.git", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516" + "url": "https://github.com/sabre-io/uri.git", + "reference": "ada354d83579565949d80b2e15593c2371225e61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/ada354d83579565949d80b2e15593c2371225e61", + "reference": "ada354d83579565949d80b2e15593c2371225e61", "shasum": "" }, "require": { - "ext-ctype": "*", - "ext-date": "*", - "ext-dom": "*", - "ext-iconv": "*", - "ext-mbstring": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "ext-spl": "*", - "lib-libxml": ">=2.7.0", - "php": ">=5.5.0", - "psr/log": "^1.0", - "sabre/event": ">=2.0.0, <4.0.0", - "sabre/http": "^4.2.1", - "sabre/uri": "^1.0.1", - "sabre/vobject": "^4.1.0", - "sabre/xml": "^1.4.0" + "php": ">=5.4.7" }, "require-dev": { - "evert/phpdoc-md": "~0.1.0", - "monolog/monolog": "^1.18", - "phpunit/phpunit": "> 4.8, <6.0.0", - "sabre/cs": "^1.0.0" - }, - "suggest": { - "ext-curl": "*", - "ext-pdo": "*" + "phpunit/phpunit": ">=4.0,<6.0", + "sabre/cs": "~1.0.0" }, - "time": "2017-02-15T03:06:08+00:00", - "bin": [ - "bin/sabredav", - "bin/naturalselection" - ], + "time": "2017-02-20T19:59:28+00:00", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.0-dev" - } - }, "installation-source": "dist", "autoload": { + "files": [ + "lib/functions.php" + ], "psr-4": { - "Sabre\\DAV\\": "lib/DAV/", - "Sabre\\DAVACL\\": "lib/DAVACL/", - "Sabre\\CalDAV\\": "lib/CalDAV/", - "Sabre\\CardDAV\\": "lib/CardDAV/" + "Sabre\\Uri\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -423,114 +399,52 @@ "role": "Developer" } ], - "description": "WebDAV Framework for PHP", - "homepage": "http://sabre.io/", + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", "keywords": [ - "CalDAV", - "CardDAV", - "WebDAV", - "framework", - "iCalendar" + "rfc3986", + "uri", + "url" ] }, { - "name": "league/html-to-markdown", - "version": "4.4.1", - "version_normalized": "4.4.1.0", + "name": "sabre/xml", + "version": "1.5.0", + "version_normalized": "1.5.0.0", "source": { "type": "git", - "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + "url": "https://github.com/sabre-io/xml.git", + "reference": "59b20e5bbace9912607481634f97d05a776ffca7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "url": "https://api.github.com/repos/sabre-io/xml/zipball/59b20e5bbace9912607481634f97d05a776ffca7", + "reference": "59b20e5bbace9912607481634f97d05a776ffca7", "shasum": "" }, "require": { "ext-dom": "*", - "ext-xml": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "mikehaertl/php-shellcommand": "~1.1.0", - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1" - }, - "time": "2017-03-16T00:45:59+00:00", - "bin": [ - "bin/html-to-markdown" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.5-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "League\\HTMLToMarkdown\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "http://www.colinodell.com", - "role": "Lead Developer" - }, - { - "name": "Nick Cernis", - "email": "nick@cern.is", - "homepage": "http://modernnerd.net", - "role": "Original Author" - } - ], - "description": "An HTML-to-markdown conversion helper for PHP", - "homepage": "https://github.com/thephpleague/html-to-markdown", - "keywords": [ - "html", - "markdown" - ] - }, - { - "name": "sabre/uri", - "version": "1.2.1", - "version_normalized": "1.2.1.0", - "source": { - "type": "git", - "url": "https://github.com/sabre-io/uri.git", - "reference": "ada354d83579565949d80b2e15593c2371225e61" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/ada354d83579565949d80b2e15593c2371225e61", - "reference": "ada354d83579565949d80b2e15593c2371225e61", - "shasum": "" - }, - "require": { - "php": ">=5.4.7" + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "lib-libxml": ">=2.6.20", + "php": ">=5.5.5", + "sabre/uri": ">=1.0,<3.0.0" }, "require-dev": { - "phpunit/phpunit": ">=4.0,<6.0", + "phpunit/phpunit": "*", "sabre/cs": "~1.0.0" }, - "time": "2017-02-20T19:59:28+00:00", + "time": "2016-10-09T22:57:52+00:00", "type": "library", "installation-source": "dist", "autoload": { - "files": [ - "lib/functions.php" - ], "psr-4": { - "Sabre\\Uri\\": "lib/" - } + "Sabre\\Xml\\": "lib/" + }, + "files": [ + "lib/Deserializer/functions.php", + "lib/Serializer/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -542,14 +456,20 @@ "email": "me@evertpot.com", "homepage": "http://evertpot.com/", "role": "Developer" + }, + { + "name": "Markus Staab", + "email": "markus.staab@redaxo.de", + "role": "Developer" } ], - "description": "Functions for making sense out of URIs.", - "homepage": "http://sabre.io/uri/", + "description": "sabre/xml is an XML library that you may not hate.", + "homepage": "https://sabre.io/xml/", "keywords": [ - "rfc3986", - "uri", - "url" + "XMLReader", + "XMLWriter", + "dom", + "xml" ] }, { @@ -652,52 +572,62 @@ ] }, { - "name": "ezyang/htmlpurifier", - "version": "v4.9.3", - "version_normalized": "4.9.3.0", + "name": "sabre/event", + "version": "3.0.0", + "version_normalized": "3.0.0.0", "source": { "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "95e1bae3182efc0f3422896a3236e991049dac69" + "url": "https://github.com/sabre-io/event.git", + "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", - "reference": "95e1bae3182efc0f3422896a3236e991049dac69", + "url": "https://api.github.com/repos/sabre-io/event/zipball/831d586f5a442dceacdcf5e9c4c36a4db99a3534", + "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534", "shasum": "" }, "require": { - "php": ">=5.2" + "php": ">=5.5" }, "require-dev": { - "simpletest/simpletest": "^1.1" + "phpunit/phpunit": "*", + "sabre/cs": "~0.0.4" }, - "time": "2017-06-03T02:28:16+00:00", + "time": "2015-11-05T20:14:39+00:00", "type": "library", "installation-source": "dist", "autoload": { - "psr-0": { - "HTMLPurifier": "library/" + "psr-4": { + "Sabre\\Event\\": "lib/" }, "files": [ - "library/HTMLPurifier.composer.php" + "lib/coroutine.php", + "lib/Loop/functions.php", + "lib/Promise/functions.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "BSD-3-Clause" ], "authors": [ { - "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", - "homepage": "http://ezyang.com" + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" } ], - "description": "Standards compliant HTML filter written in PHP", - "homepage": "http://htmlpurifier.org/", + "description": "sabre/event is a library for lightweight event-based programming", + "homepage": "http://sabre.io/event/", "keywords": [ - "html" + "EventEmitter", + "async", + "events", + "hooks", + "plugin", + "promise", + "signal" ] }, { @@ -759,132 +689,202 @@ ] }, { - "name": "pear/text_languagedetect", - "version": "v1.0.0", - "version_normalized": "1.0.0.0", + "name": "psr/log", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", - "url": "https://github.com/pear/Text_LanguageDetect.git", - "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6" + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Text_LanguageDetect/zipball/bb9ff6f4970f686fac59081e916b456021fe7ba6", - "reference": "bb9ff6f4970f686fac59081e916b456021fe7ba6", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "suggest": { - "ext-mbstring": "May require the mbstring PHP extension" + "require": { + "php": ">=5.3.0" }, - "time": "2017-03-02T16:14:08+00:00", + "time": "2016-10-10T12:19:37+00:00", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "installation-source": "dist", "autoload": { - "psr-0": { - "Text": "./" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], "license": [ - "BSD-2-Clause" + "MIT" ], "authors": [ { - "name": "Nicholas Pisarro", - "email": "taak@php.net", - "role": "Lead" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Identify human languages from text samples", - "homepage": "http://pear.php.net/package/Text_LanguageDetect" + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ] }, { - "name": "commerceguys/intl", - "version": "v0.7.4", - "version_normalized": "0.7.4.0", + "name": "sabre/dav", + "version": "3.2.2", + "version_normalized": "3.2.2.0", "source": { "type": "git", - "url": "https://github.com/commerceguys/intl.git", - "reference": "edfcfc26ed8505c4f6fcf862eb36dfda1af74b00" + "url": "https://github.com/sabre-io/dav.git", + "reference": "e987775e619728f12205606c9cc3ee565ffb1516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/commerceguys/intl/zipball/edfcfc26ed8505c4f6fcf862eb36dfda1af74b00", - "reference": "edfcfc26ed8505c4f6fcf862eb36dfda1af74b00", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", + "reference": "e987775e619728f12205606c9cc3ee565ffb1516", "shasum": "" }, "require": { - "php": ">=5.4.0" + "ext-ctype": "*", + "ext-date": "*", + "ext-dom": "*", + "ext-iconv": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "ext-spl": "*", + "lib-libxml": ">=2.7.0", + "php": ">=5.5.0", + "psr/log": "^1.0", + "sabre/event": ">=2.0.0, <4.0.0", + "sabre/http": "^4.2.1", + "sabre/uri": "^1.0.1", + "sabre/vobject": "^4.1.0", + "sabre/xml": "^1.4.0" }, "require-dev": { - "mikey179/vfsstream": "1.*", - "phpunit/phpunit": "~4.0" + "evert/phpdoc-md": "~0.1.0", + "monolog/monolog": "^1.18", + "phpunit/phpunit": "> 4.8, <6.0.0", + "sabre/cs": "^1.0.0" }, - "time": "2016-12-13T12:33:19+00:00", + "suggest": { + "ext-curl": "*", + "ext-pdo": "*" + }, + "time": "2017-02-15T03:06:08+00:00", + "bin": [ + "bin/sabredav", + "bin/naturalselection" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "0.x-dev" + "dev-master": "3.1.0-dev" } }, "installation-source": "dist", "autoload": { "psr-4": { - "CommerceGuys\\Intl\\": "src" + "Sabre\\DAV\\": "lib/DAV/", + "Sabre\\DAVACL\\": "lib/DAVACL/", + "Sabre\\CalDAV\\": "lib/CalDAV/", + "Sabre\\CardDAV\\": "lib/CardDAV/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Bojan Zivanovic" + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" } ], - "description": "Internationalization library powered by CLDR data." + "description": "WebDAV Framework for PHP", + "homepage": "http://sabre.io/", + "keywords": [ + "CalDAV", + "CardDAV", + "WebDAV", + "framework", + "iCalendar" + ] }, { - "name": "lukasreschke/id3parser", - "version": "v0.0.1", - "version_normalized": "0.0.1.0", + "name": "simplepie/simplepie", + "version": "1.5", + "version_normalized": "1.5.0.0", "source": { "type": "git", - "url": "https://github.com/LukasReschke/ID3Parser.git", - "reference": "cd3ba6e8918cc30883f01a3c24281cfe23b8877a" + "url": "https://github.com/simplepie/simplepie.git", + "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LukasReschke/ID3Parser/zipball/cd3ba6e8918cc30883f01a3c24281cfe23b8877a", - "reference": "cd3ba6e8918cc30883f01a3c24281cfe23b8877a", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab", + "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.3.0" }, - "time": "2016-04-04T09:34:50+00:00", + "require-dev": { + "phpunit/phpunit": "~4 || ~5" + }, + "suggest": { + "mf2/mf2": "Microformat module that allows for parsing HTML for microformats" + }, + "time": "2017-04-17T07:29:31+00:00", "type": "library", "installation-source": "dist", "autoload": { - "psr-4": { - "ID3Parser\\": "src/" + "psr-0": { + "SimplePie": "library" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL" + "BSD-3-Clause" ], - "homepage": "https://github.com/LukasReschke/ID3Parser/", + "authors": [ + { + "name": "Ryan Parman", + "homepage": "http://ryanparman.com/", + "role": "Creator, alumnus developer" + }, + { + "name": "Geoffrey Sneddon", + "homepage": "http://gsnedders.com/", + "role": "Alumnus developer" + }, + { + "name": "Ryan McCue", + "email": "me@ryanmccue.info", + "homepage": "http://ryanmccue.info/", + "role": "Developer" + } + ], + "description": "A simple Atom/RSS parsing library for PHP", + "homepage": "http://simplepie.org/", "keywords": [ - "codecs", - "php", - "tags" - ] + "atom", + "feeds", + "rss" + ], + "support": { + "source": "https://github.com/simplepie/simplepie/tree/1.5", + "issues": "https://github.com/simplepie/simplepie/issues" + } } ] -- cgit v1.2.3 From ad487ec9f7a76280f3976843732eed7c2c40cbf0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 17 Dec 2017 14:26:33 -0800 Subject: since api_zot (doc page) is now referenced from the project webpage, include a mention of the twitter/statusnet API plugin since that enables some degree of compatibility with dozens of third-party apps out of the box. --- doc/developer/api_zot.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/developer/api_zot.bb b/doc/developer/api_zot.bb index b2c19d7a1..ff937bfa5 100644 --- a/doc/developer/api_zot.bb +++ b/doc/developer/api_zot.bb @@ -1,5 +1,9 @@ [h3]Zot API[/h3] +Many existing social applications and tools can interface directly using the Twitter/StatusNet API, which is available using the 'twitter_api' addon. + +This document describes the native API; which allows direct programmatic access to several internal data structures and libraries extending beyond the basic social interface. + The API endpoints detailed below are relative to [code]api/z/1.0[/code], meaning that if an API is listed as [code]channel/stream[/code] the full API URL is [code][baseurl]/api/z/1.0/channel/stream[/code]. [h3]channel/export/basic[/h3] -- cgit v1.2.3 From fe960d7c28e89240902293ba064d452b92d7d27a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 12:46:37 +0100 Subject: notifications: only handle item otype notify_ids --- Zotlabs/Module/Ping.php | 4 ++-- view/tpl/notifications_widget.tpl | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index c1bce0d51..a3f6cdfec 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -279,8 +279,8 @@ class Ping extends \Zotlabs\Web\Controller { 'photo' => $tt['photo'], 'when' => relative_date($tt['created']), 'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'), - 'b64mid' => $b64mid, - 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : ''), + 'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'), + 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'), 'message' => $message ); } diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 0974045fe..299c07592 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -28,6 +28,9 @@ var path = $(this)[0].pathname.substr(1,7); var stateObj = { b64mid: b64mid }; + if(b64mid === 'undefined' && notify_id === 'undefined') + return; + {{if $module == 'display'}} history.pushState(stateObj, '', 'display/' + b64mid); {{/if}} -- cgit v1.2.3 From 08a8f195e749a120642f6c486c1dad62a73924d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 14:58:29 +0100 Subject: do not use text-muted class for $sitelocation --- view/tpl/navbar_default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index c4f5af1dc..2c9570938 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -64,7 +64,7 @@ {{$sel.name}} {{if $sitelocation}} -
{{$sitelocation}} +
{{$sitelocation}} {{/if}} -- cgit v1.2.3 From 439d41b194073285ab97be94253b3f4cb4395e43 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 15:48:49 +0100 Subject: install smarty via composer and update other php libs --- Zotlabs/Render/SmartyInterface.php | 2 - composer.json | 3 +- composer.lock | 390 +-- library/Smarty/COPYING.lib | 165 -- library/Smarty/NEW_FEATURES.txt | 133 - library/Smarty/README | 575 ---- library/Smarty/change_log.txt | 2864 -------------------- library/Smarty/libs/Autoloader.php | 124 - library/Smarty/libs/Smarty.class.php | 1482 ---------- library/Smarty/libs/SmartyBC.class.php | 455 ---- library/Smarty/libs/debug.tpl | 160 -- library/Smarty/libs/plugins/block.textformat.php | 110 - library/Smarty/libs/plugins/function.counter.php | 78 - library/Smarty/libs/plugins/function.cycle.php | 107 - library/Smarty/libs/plugins/function.fetch.php | 221 -- .../libs/plugins/function.html_checkboxes.php | 237 -- .../Smarty/libs/plugins/function.html_image.php | 163 -- .../Smarty/libs/plugins/function.html_options.php | 196 -- .../Smarty/libs/plugins/function.html_radios.php | 221 -- .../libs/plugins/function.html_select_date.php | 387 --- .../libs/plugins/function.html_select_time.php | 364 --- .../Smarty/libs/plugins/function.html_table.php | 176 -- library/Smarty/libs/plugins/function.mailto.php | 155 -- library/Smarty/libs/plugins/function.math.php | 91 - .../Smarty/libs/plugins/modifier.capitalize.php | 90 - .../Smarty/libs/plugins/modifier.date_format.php | 65 - .../libs/plugins/modifier.debug_print_var.php | 116 - library/Smarty/libs/plugins/modifier.escape.php | 198 -- .../Smarty/libs/plugins/modifier.regex_replace.php | 58 - library/Smarty/libs/plugins/modifier.replace.php | 34 - library/Smarty/libs/plugins/modifier.spacify.php | 27 - library/Smarty/libs/plugins/modifier.truncate.php | 64 - .../Smarty/libs/plugins/modifiercompiler.cat.php | 29 - .../plugins/modifiercompiler.count_characters.php | 32 - .../plugins/modifiercompiler.count_paragraphs.php | 27 - .../plugins/modifiercompiler.count_sentences.php | 27 - .../libs/plugins/modifiercompiler.count_words.php | 31 - .../libs/plugins/modifiercompiler.default.php | 35 - .../libs/plugins/modifiercompiler.escape.php | 126 - .../libs/plugins/modifiercompiler.from_charset.php | 33 - .../libs/plugins/modifiercompiler.indent.php | 33 - .../Smarty/libs/plugins/modifiercompiler.lower.php | 31 - .../libs/plugins/modifiercompiler.noprint.php | 21 - .../plugins/modifiercompiler.string_format.php | 25 - .../Smarty/libs/plugins/modifiercompiler.strip.php | 33 - .../libs/plugins/modifiercompiler.strip_tags.php | 29 - .../libs/plugins/modifiercompiler.to_charset.php | 33 - .../libs/plugins/modifiercompiler.unescape.php | 50 - .../Smarty/libs/plugins/modifiercompiler.upper.php | 29 - .../libs/plugins/modifiercompiler.wordwrap.php | 47 - .../libs/plugins/outputfilter.trimwhitespace.php | 90 - .../libs/plugins/shared.escape_special_chars.php | 53 - .../libs/plugins/shared.literal_compiler_param.php | 35 - .../Smarty/libs/plugins/shared.make_timestamp.php | 43 - .../Smarty/libs/plugins/shared.mb_str_replace.php | 55 - library/Smarty/libs/plugins/shared.mb_unicode.php | 54 - library/Smarty/libs/plugins/shared.mb_wordwrap.php | 73 - .../plugins/variablefilter.htmlspecialchars.php | 19 - .../libs/sysplugins/smarty_cacheresource.php | 223 -- .../sysplugins/smarty_cacheresource_custom.php | 281 -- .../smarty_cacheresource_keyvaluestore.php | 513 ---- library/Smarty/libs/sysplugins/smarty_data.php | 68 - .../smarty_internal_cacheresource_file.php | 225 -- .../sysplugins/smarty_internal_compile_append.php | 50 - .../sysplugins/smarty_internal_compile_assign.php | 98 - .../sysplugins/smarty_internal_compile_block.php | 292 -- .../sysplugins/smarty_internal_compile_break.php | 77 - .../sysplugins/smarty_internal_compile_call.php | 89 - .../sysplugins/smarty_internal_compile_capture.php | 117 - .../smarty_internal_compile_config_load.php | 104 - .../smarty_internal_compile_continue.php | 77 - .../sysplugins/smarty_internal_compile_debug.php | 41 - .../sysplugins/smarty_internal_compile_eval.php | 71 - .../sysplugins/smarty_internal_compile_extends.php | 134 - .../sysplugins/smarty_internal_compile_for.php | 169 -- .../sysplugins/smarty_internal_compile_foreach.php | 347 --- .../smarty_internal_compile_function.php | 210 -- .../libs/sysplugins/smarty_internal_compile_if.php | 252 -- .../sysplugins/smarty_internal_compile_include.php | 366 --- .../smarty_internal_compile_include_php.php | 111 - .../sysplugins/smarty_internal_compile_insert.php | 151 -- .../sysplugins/smarty_internal_compile_ldelim.php | 40 - .../sysplugins/smarty_internal_compile_nocache.php | 75 - ...marty_internal_compile_private_block_plugin.php | 89 - ...rty_internal_compile_private_foreachsection.php | 220 -- ...ty_internal_compile_private_function_plugin.php | 72 - .../smarty_internal_compile_private_modifier.php | 155 -- ...ernal_compile_private_object_block_function.php | 91 - ...ty_internal_compile_private_object_function.php | 84 - .../smarty_internal_compile_private_php.php | 209 -- ...y_internal_compile_private_print_expression.php | 156 -- ...y_internal_compile_private_registered_block.php | 119 - ...nternal_compile_private_registered_function.php | 79 - ...y_internal_compile_private_special_variable.php | 126 - .../sysplugins/smarty_internal_compile_rdelim.php | 39 - .../sysplugins/smarty_internal_compile_section.php | 454 ---- .../smarty_internal_compile_setfilter.php | 70 - .../smarty_internal_compile_shared_inheritance.php | 46 - .../sysplugins/smarty_internal_compile_while.php | 108 - .../sysplugins/smarty_internal_compilebase.php | 178 -- .../smarty_internal_config_file_compiler.php | 194 -- .../sysplugins/smarty_internal_configfilelexer.php | 699 ----- .../smarty_internal_configfileparser.php | 1010 ------- .../libs/sysplugins/smarty_internal_data.php | 240 -- .../libs/sysplugins/smarty_internal_debug.php | 430 --- .../sysplugins/smarty_internal_extension_clear.php | 126 - .../smarty_internal_extension_handler.php | 157 -- .../smarty_internal_method_addautoloadfilters.php | 51 - .../smarty_internal_method_adddefaultmodifiers.php | 42 - .../sysplugins/smarty_internal_method_append.php | 74 - .../smarty_internal_method_appendbyref.php | 50 - .../smarty_internal_method_assignbyref.php | 36 - .../smarty_internal_method_assignglobal.php | 43 - .../smarty_internal_method_clearallassign.php | 37 - .../smarty_internal_method_clearallcache.php | 40 - .../smarty_internal_method_clearassign.php | 44 - .../smarty_internal_method_clearcache.php | 43 - ...marty_internal_method_clearcompiledtemplate.php | 124 - .../smarty_internal_method_clearconfig.php | 41 - .../smarty_internal_method_compileallconfig.php | 32 - .../smarty_internal_method_compilealltemplates.php | 111 - .../smarty_internal_method_configload.php | 182 -- .../smarty_internal_method_createdata.php | 44 - .../smarty_internal_method_getautoloadfilters.php | 37 - .../smarty_internal_method_getconfigvars.php | 58 - .../smarty_internal_method_getdebugtemplate.php | 35 - .../smarty_internal_method_getdefaultmodifiers.php | 35 - .../smarty_internal_method_getregisteredobject.php | 44 - .../smarty_internal_method_getstreamvariable.php | 51 - .../sysplugins/smarty_internal_method_gettags.php | 62 - .../smarty_internal_method_gettemplatevars.php | 114 - .../smarty_internal_method_loadfilter.php | 77 - .../smarty_internal_method_loadplugin.php | 111 - .../smarty_internal_method_mustcompile.php | 49 - ...marty_internal_method_registercacheresource.php | 39 - .../smarty_internal_method_registerclass.php | 46 - ...nternal_method_registerdefaultconfighandler.php | 42 - ...nternal_method_registerdefaultpluginhandler.php | 43 - ...ernal_method_registerdefaulttemplatehandler.php | 72 - .../smarty_internal_method_registerfilter.php | 88 - .../smarty_internal_method_registerobject.php | 71 - .../smarty_internal_method_registerplugin.php | 50 - .../smarty_internal_method_registerresource.php | 44 - .../smarty_internal_method_setautoloadfilters.php | 70 - .../smarty_internal_method_setdebugtemplate.php | 41 - .../smarty_internal_method_setdefaultmodifiers.php | 38 - .../smarty_internal_method_unloadfilter.php | 42 - ...rty_internal_method_unregistercacheresource.php | 40 - .../smarty_internal_method_unregisterfilter.php | 42 - .../smarty_internal_method_unregisterobject.php | 40 - .../smarty_internal_method_unregisterplugin.php | 41 - .../smarty_internal_method_unregisterresource.php | 40 - .../sysplugins/smarty_internal_nocache_insert.php | 51 - .../libs/sysplugins/smarty_internal_parsetree.php | 54 - .../sysplugins/smarty_internal_parsetree_code.php | 42 - .../sysplugins/smarty_internal_parsetree_dq.php | 88 - .../smarty_internal_parsetree_dqcontent.php | 42 - .../sysplugins/smarty_internal_parsetree_tag.php | 69 - .../smarty_internal_parsetree_template.php | 128 - .../sysplugins/smarty_internal_parsetree_text.php | 40 - .../sysplugins/smarty_internal_resource_eval.php | 96 - .../smarty_internal_resource_extends.php | 124 - .../sysplugins/smarty_internal_resource_file.php | 179 -- .../sysplugins/smarty_internal_resource_php.php | 108 - .../smarty_internal_resource_registered.php | 99 - .../sysplugins/smarty_internal_resource_stream.php | 81 - .../sysplugins/smarty_internal_resource_string.php | 97 - .../smarty_internal_runtime_cachemodify.php | 67 - .../smarty_internal_runtime_codeframe.php | 94 - .../smarty_internal_runtime_filterhandler.php | 69 - .../sysplugins/smarty_internal_runtime_foreach.php | 47 - .../smarty_internal_runtime_getincludepath.php | 180 -- .../sysplugins/smarty_internal_runtime_hhvm.php | 30 - .../smarty_internal_runtime_inheritance.php | 233 -- .../smarty_internal_runtime_subtemplate.php | 203 -- .../smarty_internal_runtime_tplfunction.php | 97 - .../smarty_internal_runtime_updatecache.php | 170 -- .../smarty_internal_runtime_updatescope.php | 55 - .../smarty_internal_runtime_validatecompiled.php | 86 - .../sysplugins/smarty_internal_runtime_var.php | 33 - .../smarty_internal_runtime_writefile.php | 90 - .../smarty_internal_smartytemplatecompiler.php | 169 -- .../libs/sysplugins/smarty_internal_template.php | 376 --- .../sysplugins/smarty_internal_templatebase.php | 316 --- .../smarty_internal_templatecompilerbase.php | 1170 -------- .../sysplugins/smarty_internal_templatelexer.php | 1135 -------- .../sysplugins/smarty_internal_templateparser.php | 2833 ------------------- .../sysplugins/smarty_internal_testinstall.php | 604 ----- .../libs/sysplugins/smarty_internal_undefined.php | 48 - library/Smarty/libs/sysplugins/smarty_resource.php | 270 -- .../libs/sysplugins/smarty_resource_custom.php | 95 - .../libs/sysplugins/smarty_resource_recompiled.php | 47 - .../libs/sysplugins/smarty_resource_uncompiled.php | 79 - library/Smarty/libs/sysplugins/smarty_security.php | 715 ----- .../libs/sysplugins/smarty_template_cached.php | 246 -- .../libs/sysplugins/smarty_template_compiled.php | 297 -- .../libs/sysplugins/smarty_template_config.php | 97 - .../sysplugins/smarty_template_resource_base.php | 155 -- .../libs/sysplugins/smarty_template_source.php | 267 -- .../libs/sysplugins/smarty_undefined_variable.php | 37 - library/Smarty/libs/sysplugins/smarty_variable.php | 47 - .../libs/sysplugins/smartycompilerexception.php | 39 - library/Smarty/libs/sysplugins/smartyexception.php | 15 - vendor/bshaffer/oauth2-server-php/CHANGELOG.md | 20 +- vendor/bshaffer/oauth2-server-php/README.md | 2 +- vendor/bshaffer/oauth2-server-php/composer.json | 4 +- .../oauth2-server-php/src/OAuth2/Autoloader.php | 12 +- .../ClientAssertionTypeInterface.php | 13 + .../src/OAuth2/ClientAssertionType/HttpBasic.php | 48 +- .../src/OAuth2/Controller/AuthorizeController.php | 139 +- .../Controller/AuthorizeControllerInterface.php | 37 +- .../src/OAuth2/Controller/ResourceController.php | 49 +- .../Controller/ResourceControllerInterface.php | 29 +- .../src/OAuth2/Controller/TokenController.php | 74 +- .../OAuth2/Controller/TokenControllerInterface.php | 27 +- .../src/OAuth2/Encryption/EncryptionInterface.php | 23 + .../src/OAuth2/Encryption/Jwt.php | 58 +- .../src/OAuth2/GrantType/AuthorizationCode.php | 48 +- .../src/OAuth2/GrantType/ClientCredentials.php | 35 +- .../src/OAuth2/GrantType/GrantTypeInterface.php | 41 +- .../src/OAuth2/GrantType/JwtBearer.php | 47 +- .../src/OAuth2/GrantType/RefreshToken.php | 63 +- .../src/OAuth2/GrantType/UserCredentials.php | 46 +- .../OpenID/Controller/AuthorizeController.php | 39 +- .../Controller/AuthorizeControllerInterface.php | 2 + .../OpenID/Controller/UserInfoController.php | 40 +- .../Controller/UserInfoControllerInterface.php | 21 +- .../OAuth2/OpenID/GrantType/AuthorizationCode.php | 10 +- .../OpenID/ResponseType/AuthorizationCode.php | 30 +- .../ResponseType/AuthorizationCodeInterface.php | 14 +- .../src/OAuth2/OpenID/ResponseType/CodeIdToken.php | 16 + .../src/OAuth2/OpenID/ResponseType/IdToken.php | 58 +- .../OpenID/ResponseType/IdTokenInterface.php | 13 +- .../OAuth2/OpenID/ResponseType/IdTokenToken.php | 18 + .../OpenID/Storage/AuthorizationCodeInterface.php | 14 +- .../OAuth2/OpenID/Storage/UserClaimsInterface.php | 9 +- .../oauth2-server-php/src/OAuth2/Request.php | 70 +- .../src/OAuth2/RequestInterface.php | 23 + .../oauth2-server-php/src/OAuth2/Response.php | 134 +- .../src/OAuth2/ResponseInterface.php | 31 +- .../src/OAuth2/ResponseType/AccessToken.php | 64 +- .../OAuth2/ResponseType/AccessTokenInterface.php | 11 +- .../src/OAuth2/ResponseType/AuthorizationCode.php | 5 +- .../ResponseType/AuthorizationCodeInterface.php | 12 +- .../src/OAuth2/ResponseType/JwtAccessToken.php | 79 +- .../OAuth2/ResponseType/ResponseTypeInterface.php | 5 + .../oauth2-server-php/src/OAuth2/Scope.php | 40 +- .../src/OAuth2/ScopeInterface.php | 19 +- .../oauth2-server-php/src/OAuth2/Server.php | 283 +- .../src/OAuth2/Storage/AccessTokenInterface.php | 33 +- .../OAuth2/Storage/AuthorizationCodeInterface.php | 12 +- .../src/OAuth2/Storage/Cassandra.php | 230 +- .../src/OAuth2/Storage/CouchbaseDB.php | 2 +- .../src/OAuth2/Storage/DynamoDB.php | 2 +- .../src/OAuth2/Storage/JwtAccessToken.php | 3 +- .../src/OAuth2/Storage/Memory.php | 2 +- .../oauth2-server-php/src/OAuth2/Storage/Pdo.php | 318 ++- .../src/OAuth2/Storage/PublicKeyInterface.php | 16 +- .../OAuth2/Storage/UserCredentialsInterface.php | 16 +- .../oauth2-server-php/test/OAuth2/AutoloadTest.php | 4 +- .../OAuth2/Controller/AuthorizeControllerTest.php | 3 +- .../OAuth2/Controller/ResourceControllerTest.php | 3 +- .../test/OAuth2/Controller/TokenControllerTest.php | 45 +- .../test/OAuth2/Encryption/FirebaseJwtTest.php | 3 +- .../test/OAuth2/Encryption/JwtTest.php | 3 +- .../OAuth2/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/GrantType/ClientCredentialsTest.php | 3 +- .../test/OAuth2/GrantType/ImplicitTest.php | 3 +- .../test/OAuth2/GrantType/JwtBearerTest.php | 3 +- .../test/OAuth2/GrantType/RefreshTokenTest.php | 3 +- .../test/OAuth2/GrantType/UserCredentialsTest.php | 3 +- .../OpenID/Controller/AuthorizeControllerTest.php | 3 +- .../OpenID/Controller/UserInfoControllerTest.php | 3 +- .../OpenID/GrantType/AuthorizationCodeTest.php | 3 +- .../OAuth2/OpenID/ResponseType/CodeIdTokenTest.php | 3 +- .../OAuth2/OpenID/ResponseType/IdTokenTest.php | 3 +- .../OpenID/ResponseType/IdTokenTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/RequestTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ResponseTest.php | 4 +- .../test/OAuth2/ResponseType/AccessTokenTest.php | 3 +- .../OAuth2/ResponseType/JwtAccessTokenTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ScopeTest.php | 3 +- .../oauth2-server-php/test/OAuth2/ServerTest.php | 3 +- .../test/OAuth2/TokenType/BearerTest.php | 3 +- .../test/lib/OAuth2/Request/TestRequest.php | 7 +- .../test/lib/OAuth2/Storage/BaseTest.php | 4 +- .../test/lib/OAuth2/Storage/Bootstrap.php | 0 vendor/composer/autoload_classmap.php | 2 - vendor/composer/autoload_files.php | 5 +- vendor/composer/autoload_static.php | 7 +- vendor/composer/installed.json | 517 ++-- vendor/league/html-to-markdown/CHANGELOG.md | 15 +- vendor/league/html-to-markdown/README.md | 8 +- vendor/league/html-to-markdown/composer.json | 2 +- .../src/Converter/ListItemConverter.php | 26 +- .../src/Converter/ParagraphConverter.php | 3 +- .../league/html-to-markdown/src/HtmlConverter.php | 3 +- vendor/sabre/vobject/.travis.yml | 4 +- vendor/sabre/vobject/CHANGELOG.md | 9 + vendor/sabre/vobject/README.md | 12 +- vendor/sabre/vobject/bin/bench.php | 0 vendor/sabre/vobject/bin/fetch_windows_zones.php | 0 vendor/sabre/vobject/bin/generateicalendardata.php | 0 vendor/sabre/vobject/bin/mergeduplicates.php | 0 vendor/sabre/vobject/composer.json | 2 +- vendor/sabre/vobject/lib/Component.php | 17 +- vendor/sabre/vobject/lib/Component/VCard.php | 5 + vendor/sabre/vobject/lib/Version.php | 2 +- .../vobject/lib/timezonedata/exchangezones.php | 1 + vendor/simplepie/simplepie/library/SimplePie.php | 58 +- .../library/SimplePie/Cache/Memcached.php | 0 .../simplepie/simplepie/library/SimplePie/File.php | 3 +- .../simplepie/library/SimplePie/HTTP/Parser.php | 21 + .../simplepie/simplepie/library/SimplePie/Item.php | 30 +- .../simplepie/library/SimplePie/Parser.php | 63 +- .../simplepie/library/SimplePie/Registry.php | 0 316 files changed, 2763 insertions(+), 34992 deletions(-) delete mode 100644 library/Smarty/COPYING.lib delete mode 100644 library/Smarty/NEW_FEATURES.txt delete mode 100644 library/Smarty/README delete mode 100644 library/Smarty/change_log.txt delete mode 100644 library/Smarty/libs/Autoloader.php delete mode 100644 library/Smarty/libs/Smarty.class.php delete mode 100644 library/Smarty/libs/SmartyBC.class.php delete mode 100644 library/Smarty/libs/debug.tpl delete mode 100644 library/Smarty/libs/plugins/block.textformat.php delete mode 100644 library/Smarty/libs/plugins/function.counter.php delete mode 100644 library/Smarty/libs/plugins/function.cycle.php delete mode 100644 library/Smarty/libs/plugins/function.fetch.php delete mode 100644 library/Smarty/libs/plugins/function.html_checkboxes.php delete mode 100644 library/Smarty/libs/plugins/function.html_image.php delete mode 100644 library/Smarty/libs/plugins/function.html_options.php delete mode 100644 library/Smarty/libs/plugins/function.html_radios.php delete mode 100644 library/Smarty/libs/plugins/function.html_select_date.php delete mode 100644 library/Smarty/libs/plugins/function.html_select_time.php delete mode 100644 library/Smarty/libs/plugins/function.html_table.php delete mode 100644 library/Smarty/libs/plugins/function.mailto.php delete mode 100644 library/Smarty/libs/plugins/function.math.php delete mode 100644 library/Smarty/libs/plugins/modifier.capitalize.php delete mode 100644 library/Smarty/libs/plugins/modifier.date_format.php delete mode 100644 library/Smarty/libs/plugins/modifier.debug_print_var.php delete mode 100644 library/Smarty/libs/plugins/modifier.escape.php delete mode 100644 library/Smarty/libs/plugins/modifier.regex_replace.php delete mode 100644 library/Smarty/libs/plugins/modifier.replace.php delete mode 100644 library/Smarty/libs/plugins/modifier.spacify.php delete mode 100644 library/Smarty/libs/plugins/modifier.truncate.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.cat.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_characters.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_paragraphs.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_sentences.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.count_words.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.default.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.escape.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.from_charset.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.indent.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.lower.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.noprint.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.string_format.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.strip.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.strip_tags.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.to_charset.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.unescape.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.upper.php delete mode 100644 library/Smarty/libs/plugins/modifiercompiler.wordwrap.php delete mode 100644 library/Smarty/libs/plugins/outputfilter.trimwhitespace.php delete mode 100644 library/Smarty/libs/plugins/shared.escape_special_chars.php delete mode 100644 library/Smarty/libs/plugins/shared.literal_compiler_param.php delete mode 100644 library/Smarty/libs/plugins/shared.make_timestamp.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_str_replace.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_unicode.php delete mode 100644 library/Smarty/libs/plugins/shared.mb_wordwrap.php delete mode 100644 library/Smarty/libs/plugins/variablefilter.htmlspecialchars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_data.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_append.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_block.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_break.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_call.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_eval.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_for.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_if.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_include.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_section.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compile_while.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_compilebase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_data.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_debug.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_extension_clear.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_extension_handler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_append.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_appendbyref.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_assignbyref.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_assignglobal.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearallassign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearallcache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearassign.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearcache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_configload.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_createdata.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_gettags.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_loadplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_mustcompile.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerclass.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_code.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_template.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_file.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_php.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_resource_string.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_foreach.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_var.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_runtime_writefile.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_template.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatebase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_templateparser.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_testinstall.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_internal_undefined.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_custom.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_recompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_security.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_cached.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_compiled.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_config.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_resource_base.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_template_source.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_undefined_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smarty_variable.php delete mode 100644 library/Smarty/libs/sysplugins/smartycompilerexception.php delete mode 100644 library/Smarty/libs/sysplugins/smartyexception.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php mode change 100755 => 100644 vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php mode change 100755 => 100644 vendor/sabre/vobject/bin/bench.php mode change 100755 => 100644 vendor/sabre/vobject/bin/fetch_windows_zones.php mode change 100755 => 100644 vendor/sabre/vobject/bin/generateicalendardata.php mode change 100755 => 100644 vendor/sabre/vobject/bin/mergeduplicates.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php mode change 100755 => 100644 vendor/simplepie/simplepie/library/SimplePie/Registry.php diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php index 0e3a47c2f..9c9a501c0 100755 --- a/Zotlabs/Render/SmartyInterface.php +++ b/Zotlabs/Render/SmartyInterface.php @@ -2,8 +2,6 @@ namespace Zotlabs\Render; -require_once('library/Smarty/libs/Smarty.class.php'); - class SmartyInterface extends \Smarty { public $filename; diff --git a/composer.json b/composer.json index d7d979129..f89fb15b2 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "league/html-to-markdown": "^4.4", "pear/text_languagedetect": "^1.0", "commerceguys/intl": "~0.7", - "lukasreschke/id3parser": "^0.0.1" + "lukasreschke/id3parser": "^0.0.1", + "smarty/smarty": "~3.1" }, "require-dev" : { "php" : ">=7.0", diff --git a/composer.lock b/composer.lock index 0a7db1306..e2703afdd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3898249f4ed6128a2e7dbcd1744106be", + "content-hash": "73ca170baa6ded94a989b8a1066e6a98", "packages": [ { "name": "bshaffer/oauth2-server-php", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/bshaffer/oauth2-server-php.git", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697" + "reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697", - "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697", + "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/d158878425392fe5a0cc34f15dbaf46315ae0ed9", + "reference": "d158878425392fe5a0cc34f15dbaf46315ae0ed9", "shasum": "" }, "require": { @@ -27,12 +27,14 @@ "aws/aws-sdk-php": "~2.8", "firebase/php-jwt": "~2.2", "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^4.0", "predis/predis": "dev-master", "thobbs/phpcassa": "dev-master" }, "suggest": { "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage", - "firebase/php-jwt": "~1.1 is required to use MondoDB storage", + "firebase/php-jwt": "~2.2 is required to use JWT features", + "mongodb/mongodb": "^1.1 is required to use MongoDB storage", "predis/predis": "Required to use Redis storage", "thobbs/phpcassa": "Required to use Cassandra storage" }, @@ -60,7 +62,7 @@ "oauth", "oauth2" ], - "time": "2017-01-06T23:20:00+00:00" + "time": "2017-11-15T01:41:02+00:00" }, { "name": "commerceguys/intl", @@ -155,16 +157,16 @@ }, { "name": "league/html-to-markdown", - "version": "4.4.1", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186" + "reference": "9022e648bc40e44cb3b18438d97ed8715ecbc49b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186", - "reference": "82ea375b5b2b1da1da222644c0565c695bf88186", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/9022e648bc40e44cb3b18438d97ed8715ecbc49b", + "reference": "9022e648bc40e44cb3b18438d97ed8715ecbc49b", "shasum": "" }, "require": { @@ -183,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.5-dev" + "dev-master": "4.7-dev" } }, "autoload": { @@ -215,7 +217,7 @@ "html", "markdown" ], - "time": "2017-03-16T00:45:59+00:00" + "time": "2017-10-24T02:45:05+00:00" }, { "name": "lukasreschke/id3parser", @@ -643,16 +645,16 @@ }, { "name": "sabre/vobject", - "version": "4.1.2", + "version": "4.1.3", "source": { "type": "git", "url": "https://github.com/sabre-io/vobject.git", - "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c" + "reference": "df9916813d1d83e4f761c4cba13361ee74196fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/vobject/zipball/d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c", - "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/df9916813d1d83e4f761c4cba13361ee74196fac", + "reference": "df9916813d1d83e4f761c4cba13361ee74196fac", "shasum": "" }, "require": { @@ -661,7 +663,7 @@ "sabre/xml": ">=1.5 <3.0" }, "require-dev": { - "phpunit/phpunit": "*", + "phpunit/phpunit": "> 4.8, <6.0.0", "sabre/cs": "^1.0.0" }, "suggest": { @@ -736,7 +738,7 @@ "xCal", "xCard" ], - "time": "2016-12-06T04:14:09+00:00" + "time": "2017-10-18T08:29:40+00:00" }, { "name": "sabre/xml", @@ -803,16 +805,16 @@ }, { "name": "simplepie/simplepie", - "version": "1.5", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab" + "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab", - "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", + "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", "shasum": "" }, "require": { @@ -859,10 +861,63 @@ "rss" ], "support": { - "source": "https://github.com/simplepie/simplepie/tree/1.5", + "source": "https://github.com/simplepie/simplepie/tree/1.5.1", "issues": "https://github.com/simplepie/simplepie/issues" }, - "time": "2017-04-17T07:29:31+00:00" + "time": "2017-11-12T02:03:34+00:00" + }, + { + "name": "smarty/smarty", + "version": "v3.1.31", + "source": { + "type": "git", + "url": "https://github.com/smarty-php/smarty.git", + "reference": "c7d42e4a327c402897dd587871434888fde1e7a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9", + "reference": "c7d42e4a327c402897dd587871434888fde1e7a9", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "files": [ + "libs/bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Monte Ohrt", + "email": "monte@ohrt.com" + }, + { + "name": "Uwe Tews", + "email": "uwe.tews@googlemail.com" + }, + { + "name": "Rodney Rehm", + "email": "rodney.rehm@medialize.de" + } + ], + "description": "Smarty - the compiling PHP template engine", + "homepage": "http://www.smarty.net", + "keywords": [ + "templating" + ], + "time": "2016-12-14T21:57:25+00:00" } ], "packages-dev": [ @@ -1313,32 +1368,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1363,28 +1418,31 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "fabpot/goutte", - "version": "v3.2.1", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638" + "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/db5c28f4a010b4161d507d5304e28a7ebf211638", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/395f61d7c2e15a813839769553a4de16fa3b3c96", + "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", "php": ">=5.5.0", - "symfony/browser-kit": "~2.1|~3.0", - "symfony/css-selector": "~2.1|~3.0", - "symfony/dom-crawler": "~2.1|~3.0" + "symfony/browser-kit": "~2.1|~3.0|~4.0", + "symfony/css-selector": "~2.1|~3.0|~4.0", + "symfony/dom-crawler": "~2.1|~3.0|~4.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.3 || ^4" }, "type": "application", "extra": { @@ -1395,7 +1453,10 @@ "autoload": { "psr-4": { "Goutte\\": "Goutte" - } + }, + "exclude-from-classmap": [ + "Goutte/Tests" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1412,7 +1473,7 @@ "keywords": [ "scraper" ], - "time": "2017-01-03T13:21:43+00:00" + "time": "2017-11-19T08:45:40+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1909,16 +1970,16 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -1959,33 +2020,39 @@ "reflection", "static analysis" ], - "time": "2015-12-27T11:43:31+00:00" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -2004,24 +2071,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -2051,7 +2118,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", @@ -3333,30 +3400,28 @@ }, { "name": "symfony/config", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "e57211b88aa889fefac1cb36866db04100b0f21c" + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/e57211b88aa889fefac1cb36866db04100b0f21c", - "reference": "e57211b88aa889fefac1cb36866db04100b0f21c", + "url": "https://api.github.com/repos/symfony/config/zipball/0356e6d5298e9e72212c0bad65c2f1b49e42d622", + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" + "php": "^7.1.3", + "symfony/filesystem": "~3.4|~4.0" }, "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" + "symfony/finder": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -3364,7 +3429,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3391,25 +3456,24 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/console", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e" + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9f21adfb92a9315b73ae2ed43138988ee4913d4e", - "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e", + "url": "https://api.github.com/repos/symfony/console/zipball/de8cf039eacdec59d83f7def67e3b8ff5ed46714", + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3418,11 +3482,11 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "symfony/process": "~3.4|~4.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3433,7 +3497,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3460,7 +3524,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/css-selector", @@ -3515,83 +3579,27 @@ "homepage": "https://symfony.com", "time": "2017-12-14T19:40:10+00:00" }, - { - "name": "symfony/debug", - "version": "v3.4.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "543deab3ffff94402440b326fc94153bae2dfa7a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/543deab3ffff94402440b326fc94153bae2dfa7a", - "reference": "543deab3ffff94402440b326fc94153bae2dfa7a", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2017-12-12T08:27:14+00:00" - }, { "name": "symfony/dependency-injection", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333" + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", - "reference": "5f81907ea43bfa971ac2c7fbac593ebe7cd7d333", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d2fa088b5fd7d429974a36bf1a9846b912d9d124", + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "psr/container": "^1.0" }, "conflict": { - "symfony/config": "<3.3.7", - "symfony/finder": "<3.3", + "symfony/config": "<3.4", + "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", "symfony/yaml": "<3.4" }, @@ -3599,8 +3607,8 @@ "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3613,7 +3621,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3640,7 +3648,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/dom-crawler", @@ -3700,30 +3708,30 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835" + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b869cbf8a15ca6261689de2c28a7d7f2d0706835", - "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d4face19ed8002eec8280bc1c5ec18130472bf43", + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3732,7 +3740,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3759,29 +3767,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "25b135bea251829e3db6a77d773643408b575ed4" + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/25b135bea251829e3db6a77d773643408b575ed4", - "reference": "25b135bea251829e3db6a77d773643408b575ed4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8c2868641d0c4885eee9c12a89c2b695eb1985cd", + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3808,7 +3816,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-12-14T19:40:10+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3871,33 +3879,33 @@ }, { "name": "symfony/translation", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6" + "reference": "e2678768d2fcb7fe3d8108392626de1ece575634" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4c5d5582baf2829751a5207659329c1f52eedeb6", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6", + "url": "https://api.github.com/repos/symfony/translation/zipball/e2678768d2fcb7fe3d8108392626de1ece575634", + "reference": "e2678768d2fcb7fe3d8108392626de1ece575634", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3908,7 +3916,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3935,24 +3943,24 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-12-12T08:27:14+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.2", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "afe0cd38486505c9703707707d91450cfc1bd536" + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/afe0cd38486505c9703707707d91450cfc1bd536", - "reference": "afe0cd38486505c9703707707d91450cfc1bd536", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a5ee52d155f06ad23b19eb63c31228ff56ad1116", + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { "symfony/console": "<3.4" @@ -3966,7 +3974,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -3993,7 +4001,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-12-11T20:38:23+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "theseer/tokenizer", diff --git a/library/Smarty/COPYING.lib b/library/Smarty/COPYING.lib deleted file mode 100644 index 02bbb60bc..000000000 --- a/library/Smarty/COPYING.lib +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. \ No newline at end of file diff --git a/library/Smarty/NEW_FEATURES.txt b/library/Smarty/NEW_FEATURES.txt deleted file mode 100644 index 1a51c71d9..000000000 --- a/library/Smarty/NEW_FEATURES.txt +++ /dev/null @@ -1,133 +0,0 @@ - - -This file contains a brief description of new features which have been added to Smarty 3.1 - -Smarty 3.1.28 - - OPCACHE - ======= - Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE. - Correct operation is no longer dependent on OPCACHE configuration settings. - - Template inheritance - ==================== - Template inheritance is now processed in run time. - See the INHERITANCE_RELEASE_NOTES - - Modifier regex_replace - ====================== - An optional limit parameter was added - - fetch() and display() - ===================== - The fetch() and display() methods of the template object accept now optionally the same parameter - as the corresponding Smarty methods to get the content of another template. - Example: - $template->display(); Does display template of template object - $template->display('foo.tpl'); Does display template 'foo.bar' - - File: resource - ============== - Multiple template_dir entries can now be selected by a comma separated list of indices. - The template_dir array is searched in the order of the indices. (Could be used to change the default search order) - Example: - $smarty->display('[1],[0]foo.bar'); - - Filter support - ============== - Optional filter names - An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name. - - $smarty->registerFilter('output', $callback, 'name'); - $smarty->unregister('output', 'name'); - - Closures - $smarty->registerFilter() does now accept closures. - - $smarty->registerFilter('pre', function($source) {return $source;}); - If no optional filter name was specified it gets the default name 'closure'. - If you register multiple closures register each with a unique filter name. - - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1'); - - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2'); - - -Smarty 3.1.22 - - Namespace support within templates - ================================== - Within templates you can now use namespace specifications on: - - Constants like foo\bar\FOO - - Class names like foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo() - - PHP function names like foo\bar\baz() - - Security - ======== - - disable special $smarty variable - - The Smarty_Security class has the new property $disabled_special_smarty_vars. - It's an array which can be loaded with the $smarty special variable names like - 'template_object', 'template', 'current_dir' and others which will be disabled. - Note: That this security check is performed at compile time. - - - limit template nesting - - Property $max_template_nesting of Smarty_Security does set the maximum template nesting level. - The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded - an Exception will be thrown. The default setting is 0 which does disable this check. - - - trusted static methods - - The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods. - It's an nested array of trusted class and method names. - Format: - array ( - 'class_1' => array('method_1', 'method_2'), // allowed methods - 'class_2' => array(), // all methods of class allowed - ) - To disable access for all methods of all classes set $trusted_static_methods = null; - The default value is an empty array() which does enables all methods of all classes, but for backward compatibility - the setting of $static_classes will be checked. - Note: That this security check is performed at compile time. - - - trusted static properties - - The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties. - It's an nested array of trusted class and property names. - Format: - array ( - 'class_1' => array('prop_1', 'prop_2'), // allowed properties listed - 'class_2' => array(), // all properties of class allowed - } - To disable access for all properties of all classes set $trusted_static_properties = null; - The default value is an empty array() which does enables all properties of all classes, but for backward compatibility - the setting of $static_classes will be checked. - Note: That this security check is performed at compile time. - - - trusted constants . - The Smarty_Security class has the new property $trusted_constants to restrict access to constants. - It's an array of trusted constant names. - Format: - array ( - 'SMARTY_DIR' , // allowed constant - } - If the array is empty (default) the usage of constants can be controlled with the - Smarty_Security::$allow_constants property (default true) - - - - Compiled Templates - ================== - Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html - property and creates different compiled templates files depending on the setting. - - Same applies to config files and the $config_overwrite, $config_booleanize and - $config_read_hidden properties. - - Debugging - ========= - The layout of the debug window has been changed for better readability - - New class constants - Smarty::DEBUG_OFF - Smarty::DEBUG_ON - Smarty::DEBUG_INDIVIDUAL - have been introduced for setting the $debugging property. - - Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window. - - . - diff --git a/library/Smarty/README b/library/Smarty/README deleted file mode 100644 index 08b397c3f..000000000 --- a/library/Smarty/README +++ /dev/null @@ -1,575 +0,0 @@ -Smarty 3.x - -Author: Monte Ohrt -Author: Uwe Tews - -AN INTRODUCTION TO SMARTY 3 - -NOTICE FOR 3.1 release: - -Please see the SMARTY_3.1_NOTES.txt file that comes with the distribution. - -NOTICE for 3.0.5 release: - -Smarty now follows the PHP error_reporting level by default. If PHP does not mask E_NOTICE and you try to access an unset template variable, you will now get an E_NOTICE warning. To revert to the old behavior: - -$smarty->error_reporting = E_ALL & ~E_NOTICE; - -NOTICE for 3.0 release: - -IMPORTANT: Some API adjustments have been made between the RC4 and 3.0 release. -We felt it is better to make these now instead of after a 3.0 release, then have to -immediately deprecate APIs in 3.1. Online documentation has been updated -to reflect these changes. Specifically: - ----- API CHANGES RC4 -> 3.0 ---- - -$smarty->register->* -$smarty->unregister->* -$smarty->utility->* -$samrty->cache->* - -Have all been changed to local method calls such as: - -$smarty->clearAllCache() -$smarty->registerFoo() -$smarty->unregisterFoo() -$smarty->testInstall() -etc. - -Registration of function, block, compiler, and modifier plugins have been -consolidated under two API calls: - -$smarty->registerPlugin(...) -$smarty->unregisterPlugin(...) - -Registration of pre, post, output and variable filters have been -consolidated under two API calls: - -$smarty->registerFilter(...) -$smarty->unregisterFilter(...) - -Please refer to the online documentation for all specific changes: - -http://www.smarty.net/documentation - ----- - -The Smarty 3 API has been refactored to a syntax geared -for consistency and modularity. The Smarty 2 API syntax is still supported, but -will throw a deprecation notice. You can disable the notices, but it is highly -recommended to adjust your syntax to Smarty 3, as the Smarty 2 syntax must run -through an extra rerouting wrapper. - -Basically, all Smarty methods now follow the "fooBarBaz" camel case syntax. Also, -all Smarty properties now have getters and setters. So for example, the property -$smarty->cache_dir can be set with $smarty->setCacheDir('foo/') and can be -retrieved with $smarty->getCacheDir(). - -Some of the Smarty 3 APIs have been revoked such as the "is*" methods that were -just duplicate functions of the now available "get*" methods. - -Here is a rundown of the Smarty 3 API: - -$smarty->fetch($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->display($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->isCached($template, $cache_id = null, $compile_id = null) -$smarty->createData($parent = null) -$smarty->createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) -$smarty->enableSecurity() -$smarty->disableSecurity() -$smarty->setTemplateDir($template_dir) -$smarty->addTemplateDir($template_dir) -$smarty->templateExists($resource_name) -$smarty->loadPlugin($plugin_name, $check = true) -$smarty->loadFilter($type, $name) -$smarty->setExceptionHandler($handler) -$smarty->addPluginsDir($plugins_dir) -$smarty->getGlobal($varname = null) -$smarty->getRegisteredObject($name) -$smarty->getDebugTemplate() -$smarty->setDebugTemplate($tpl_name) -$smarty->assign($tpl_var, $value = null, $nocache = false) -$smarty->assignGlobal($varname, $value = null, $nocache = false) -$smarty->assignByRef($tpl_var, &$value, $nocache = false) -$smarty->append($tpl_var, $value = null, $merge = false, $nocache = false) -$smarty->appendByRef($tpl_var, &$value, $merge = false) -$smarty->clearAssign($tpl_var) -$smarty->clearAllAssign() -$smarty->configLoad($config_file, $sections = null) -$smarty->getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) -$smarty->getConfigVariable($variable) -$smarty->getStreamVariable($variable) -$smarty->getConfigVars($varname = null) -$smarty->clearConfig($varname = null) -$smarty->getTemplateVars($varname = null, $_ptr = null, $search_parents = true) -$smarty->clearAllCache($exp_time = null, $type = null) -$smarty->clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) - -$smarty->registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = array()) - -$smarty->registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) - -$smarty->registerFilter($type, $function_name) -$smarty->registerResource($resource_type, $function_names) -$smarty->registerDefaultPluginHandler($function_name) -$smarty->registerDefaultTemplateHandler($function_name) - -$smarty->unregisterPlugin($type, $tag) -$smarty->unregisterObject($object_name) -$smarty->unregisterFilter($type, $function_name) -$smarty->unregisterResource($resource_type) - -$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) -$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) -$smarty->testInstall() - -// then all the getters/setters, available for all properties. Here are a few: - -$caching = $smarty->getCaching(); // get $smarty->caching -$smarty->setCaching(true); // set $smarty->caching -$smarty->setDeprecationNotices(false); // set $smarty->deprecation_notices -$smarty->setCacheId($id); // set $smarty->cache_id -$debugging = $smarty->getDebugging(); // get $smarty->debugging - - -FILE STRUCTURE - -The Smarty 3 file structure is similar to Smarty 2: - -/libs/ - Smarty.class.php -/libs/sysplugins/ - internal.* -/libs/plugins/ - function.mailto.php - modifier.escape.php - ... - -A lot of Smarty 3 core functionality lies in the sysplugins directory; you do -not need to change any files here. The /libs/plugins/ folder is where Smarty -plugins are located. You can add your own here, or create a separate plugin -directory, just the same as Smarty 2. You will still need to create your own -/cache/, /templates/, /templates_c/, /configs/ folders. Be sure /cache/ and -/templates_c/ are writable. - -The typical way to use Smarty 3 should also look familiar: - -require('Smarty.class.php'); -$smarty = new Smarty; -$smarty->assign('foo','bar'); -$smarty->display('index.tpl'); - - -However, Smarty 3 works completely different on the inside. Smarty 3 is mostly -backward compatible with Smarty 2, except for the following items: - -*) Smarty 3 is PHP 5 only. It will not work with PHP 4. -*) The {php} tag is disabled by default. Enable with $smarty->allow_php_tag=true. -*) Delimiters surrounded by whitespace are no longer treated as Smarty tags. - Therefore, { foo } will not compile as a tag, you must use {foo}. This change - Makes Javascript/CSS easier to work with, eliminating the need for {literal}. - This can be disabled by setting $smarty->auto_literal = false; -*) The Smarty 3 API is a bit different. Many Smarty 2 API calls are deprecated - but still work. You will want to update your calls to Smarty 3 for maximum - efficiency. - - -There are many things that are new to Smarty 3. Here are the notable items: - -LEXER/PARSER -============ - -Smarty 3 now uses a lexing tokenizer for its parser/compiler. Basically, this -means Smarty has some syntax additions that make life easier such as in-template -math, shorter/intuitive function parameter options, infinite function recursion, -more accurate error handling, etc. - - -WHAT IS NEW IN SMARTY TEMPLATE SYNTAX -===================================== - -Smarty 3 allows expressions almost anywhere. Expressions can include PHP -functions as long as they are not disabled by the security policy, object -methods and properties, etc. The {math} plugin is no longer necessary but -is still supported for BC. - -Examples: -{$x+$y} will output the sum of x and y. -{$foo = strlen($bar)} function in assignment -{assign var=foo value= $x+$y} in attributes -{$foo = myfunct( ($x+$y)*3 )} as function parameter -{$foo[$x+3]} as array index - -Smarty tags can be used as values within other tags. -Example: {$foo={counter}+3} - -Smarty tags can also be used inside double quoted strings. -Example: {$foo="this is message {counter}"} - -You can define arrays within templates. -Examples: -{assign var=foo value=[1,2,3]} -{assign var=foo value=['y'=>'yellow','b'=>'blue']} -Arrays can be nested. -{assign var=foo value=[1,[9,8],3]} - -There is a new short syntax supported for assigning variables. -Example: {$foo=$bar+2} - -You can assign a value to a specific array element. If the variable exists but -is not an array, it is converted to an array before the new values are assigned. -Examples: -{$foo['bar']=1} -{$foo['bar']['blar']=1} - -You can append values to an array. If the variable exists but is not an array, -it is converted to an array before the new values are assigned. -Example: {$foo[]=1} - -You can use a PHP-like syntax for accessing array elements, as well as the -original "dot" notation. -Examples: -{$foo[1]} normal access -{$foo['bar']} -{$foo['bar'][1]} -{$foo[$x+$x]} index may contain any expression -{$foo[$bar[1]]} nested index -{$foo[section_name]} smarty section access, not array access! - -The original "dot" notation stays, and with improvements. -Examples: -{$foo.a.b.c} => $foo['a']['b']['c'] -{$foo.a.$b.c} => $foo['a'][$b]['c'] with variable index -{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c'] with expression as index -{$foo.a.{$b.c}} => $foo['a'][$b['c']] with nested index - -note that { and } are used to address ambiguties when nesting the dot syntax. - -Variable names themselves can be variable and contain expressions. -Examples: -$foo normal variable -$foo_{$bar} variable name containing other variable -$foo_{$x+$y} variable name containing expressions -$foo_{$bar}_buh_{$blar} variable name with multiple segments -{$foo_{$x}} will output the variable $foo_1 if $x has a value of 1. - -Object method chaining is implemented. -Example: {$object->method1($x)->method2($y)} - -{for} tag added for looping (replacement for {section} tag): -{for $x=0, $y=count($foo); $x<$y; $x++} .... {/for} -Any number of statements can be used separated by comma as the first -inital expression at {for}. - -{for $x = $start to $end step $step} ... {/for}is in the SVN now . -You can use also -{for $x = $start to $end} ... {/for} -In this case the step value will be automaticall 1 or -1 depending on the start and end values. -Instead of $start and $end you can use any valid expression. -Inside the loop the following special vars can be accessed: -$x@iteration = number of iteration -$x@total = total number of iterations -$x@first = true on first iteration -$x@last = true on last iteration - - -The Smarty 2 {section} syntax is still supported. - -New shorter {foreach} syntax to loop over an array. -Example: {foreach $myarray as $var}...{/foreach} - -Within the foreach loop, properties are access via: - -$var@key foreach $var array key -$var@iteration foreach current iteration count (1,2,3...) -$var@index foreach current index count (0,1,2...) -$var@total foreach $var array total -$var@first true on first iteration -$var@last true on last iteration - -The Smarty 2 {foreach} tag syntax is still supported. - -NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. -If you want to access an array element with index foo, you must use quotes -such as {$bar['foo']}, or use the dot syntax {$bar.foo}. - -while block tag is now implemented: -{while $foo}...{/while} -{while $x lt 10}...{/while} - -Direct access to PHP functions: -Just as you can use PHP functions as modifiers directly, you can now access -PHP functions directly, provided they are permitted by security settings: -{time()} - -There is a new {function}...{/function} block tag to implement a template function. -This enables reuse of code sequences like a plugin function. It can call itself recursively. -Template function must be called with the new {call name=foo...} tag. - -Example: - -Template file: -{function name=menu level=0} -
    - {foreach $data as $entry} - {if is_array($entry)} -
  • {$entry@key}
    • - {call name=menu data=$entry level=$level+1} - {else} -
  • {$entry}
    • - {/if} - {/foreach} -
-{/function} - -{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' => - ['item3-3-1','item3-3-2']],'item4']} - -{call name=menu data=$menu} - - -Generated output: - * item1 - * item2 - * item3 - o item3-1 - o item3-2 - o item3-3 - + item3-3-1 - + item3-3-2 - * item4 - -The function tag itself must have the "name" attribute. This name is the tag -name when calling the function. The function tag may have any number of -additional attributes. These will be default settings for local variables. - -New {nocache} block function: -{nocache}...{/nocache} will declare a section of the template to be non-cached -when template caching is enabled. - -New nocache attribute: -You can declare variable/function output as non-cached with the nocache attribute. -Examples: - -{$foo nocache=true} -{$foo nocache} /* same */ - -{foo bar="baz" nocache=true} -{foo bar="baz" nocache} /* same */ - -{time() nocache=true} -{time() nocache} /* same */ - -Or you can also assign the variable in your script as nocache: -$smarty->assign('foo',$something,true); // third param is nocache setting -{$foo} /* non-cached */ - -$smarty.current_dir returns the directory name of the current template. - -You can use strings directly as templates with the "string" resource type. -Examples: -$smarty->display('string:This is my template, {$foo}!'); // php -{include file="string:This is my template, {$foo}!"} // template - - - -VARIABLE SCOPE / VARIABLE STORAGE -================================= - -In Smarty 2, all assigned variables were stored within the Smarty object. -Therefore, all variables assigned in PHP were accessible by all subsequent -fetch and display template calls. - -In Smarty 3, we have the choice to assign variables to the main Smarty object, -to user-created data objects, and to user-created template objects. -These objects can be chained. The object at the end of a chain can access all -variables belonging to that template and all variables within the parent objects. -The Smarty object can only be the root of a chain, but a chain can be isolated -from the Smarty object. - -All known Smarty assignment interfaces will work on the data and template objects. - -Besides the above mentioned objects, there is also a special storage area for -global variables. - -A Smarty data object can be created as follows: -$data = $smarty->createData(); // create root data object -$data->assign('foo','bar'); // assign variables as usual -$data->config_load('my.conf'); // load config file - -$data= $smarty->createData($smarty); // create data object having a parent link to -the Smarty object - -$data2= $smarty->createData($data); // create data object having a parent link to -the $data data object - -A template object can be created by using the createTemplate method. It has the -same parameter assignments as the fetch() or display() method. -Function definition: -function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) - -The first parameter can be a template name, a smarty object or a data object. - -Examples: -$tpl = $smarty->createTemplate('mytpl.tpl'); // create template object not linked to any parent -$tpl->assign('foo','bar'); // directly assign variables -$tpl->config_load('my.conf'); // load config file - -$tpl = $smarty->createTemplate('mytpl.tpl',$smarty); // create template having a parent link to the Smarty object -$tpl = $smarty->createTemplate('mytpl.tpl',$data); // create template having a parent link to the $data object - -The standard fetch() and display() methods will implicitly create a template object. -If the $parent parameter is not specified in these method calls, the template object -is will link back to the Smarty object as it's parent. - -If a template is called by an {include...} tag from another template, the -subtemplate links back to the calling template as it's parent. - -All variables assigned locally or from a parent template are accessible. If the -template creates or modifies a variable by using the {assign var=foo...} or -{$foo=...} tags, these new values are only known locally (local scope). When the -template exits, none of the new variables or modifications can be seen in the -parent template(s). This is same behavior as in Smarty 2. - -With Smarty 3, we can assign variables with a scope attribute which allows the -availablility of these new variables or modifications globally (ie in the parent -templates.) - -Possible scopes are local, parent, root and global. -Examples: -{assign var=foo value='bar'} // no scope is specified, the default 'local' -{$foo='bar'} // same, local scope -{assign var=foo value='bar' scope='local'} // same, local scope - -{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object -{$foo='bar' scope='parent'} // (normally the calling template) - -{assign var=foo value='bar' scope='root'} // Values will be exported up to the root object, so they can -{$foo='bar' scope='root'} // be seen from all templates using the same root. - -{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, -{$foo='bar' scope='global'} // they are available to any and all templates. - - -The scope attribute can also be attached to the {include...} tag. In this case, -the specified scope will be the default scope for all assignments within the -included template. - - -PLUGINS -======= - -Smarty 3 plugins follow the same coding rules as in Smarty 2. -The main difference is that the template object is now passed in place of the smarty object. -The smarty object can be still be accessed through $template->smarty. - -smarty_plugintype_name (array $params, Smarty_Internal_Template $template) - -The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals. - - -TEMPLATE INHERITANCE: -===================== - -With template inheritance you can define blocks, which are areas that can be -overriden by child templates, so your templates could look like this: - -parent.tpl: - - - {block name='title'}My site name{/block} - - -

{block name='page-title'}Default page title{/block}

-
- {block name='content'} - Default content - {/block} -
- - - -child.tpl: -{extends file='parent.tpl'} -{block name='title'} -Child title -{/block} - -grandchild.tpl: -{extends file='child.tpl'} -{block name='title'}Home - {$smarty.block.parent}{/block} -{block name='page-title'}My home{/block} -{block name='content'} - {foreach $images as $img} - {$img.description} - {/foreach} -{/block} - -We redefined all the blocks here, however in the title block we used {$smarty.block.parent}, -which tells Smarty to insert the default content from the parent template in its place. -The content block was overriden to display the image files, and page-title has also be -overriden to display a completely different title. - -If we render grandchild.tpl we will get this: - - - Home - Child title - - -

My home

-
- image - image - image -
- - - -NOTE: In the child templates everything outside the {extends} or {block} tag sections -is ignored. - -The inheritance tree can be as big as you want (meaning you can extend a file that -extends another one that extends another one and so on..), but be aware that all files -have to be checked for modifications at runtime so the more inheritance the more overhead you add. - -Instead of defining the parent/child relationships with the {extends} tag in the child template you -can use the resource as follow: - -$smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); - -Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content -is appended or prepended to the child block content. - -{block name='title' append} My title {/block} - - -PHP STREAMS: -============ - -(see online documentation) - -VARIBLE FILTERS: -================ - -(see online documentation) - - -STATIC CLASS ACCESS AND NAMESPACE SUPPORT -========================================= - -You can register a class with optional namespace for the use in the template like: - -$smarty->register->templateClass('foo','name\name2\myclass'); - -In the template you can use it like this: -{foo::method()} etc. - - -======================= - -Please look through it and send any questions/suggestions/etc to the forums. - -http://www.phpinsider.com/smarty-forum/viewtopic.php?t=14168 - -Monte and Uwe diff --git a/library/Smarty/change_log.txt b/library/Smarty/change_log.txt deleted file mode 100644 index dadc5d17d..000000000 --- a/library/Smarty/change_log.txt +++ /dev/null @@ -1,2864 +0,0 @@ - ===== 3.1.29 ===== (21.12.2015) - 21.12.2015 - - optimization improve speed of filetime checks on extends and extendsall resource - - 20.12.2015 - - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123 - - update compilation of Smarty special variables - - bugfix add addition check for OS type on normalizaition of file path https://github.com/smarty-php/smarty/issues/134 - - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123 - - 19.12.2015 - - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 - - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139 - - remove no longer used code - - improvement make sure that compiled and cache templates never can contain a trailing '?>? - - 18.12.2015 - - bugfix regression when modifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132 - - 17.12.2015 - - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135 - - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827) - - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834) - - 16.12.2015 - - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128 - - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121 - - 15.12.2015 - - bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122 - - bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828) - - 14.12.2015 - - bugfix {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120 - - bugfix multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118 - - ===== 3.1.28 ===== (13.12.2015) - 13.12.2015 - - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819) - - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811) - - bugfix Debug Console could display incorrect data when using subtemplates - - 09.12.2015 - - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true; - - 09.12.2015 - - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111 - - 08.12.2015 - - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114 - - 05.12.2015 - -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111 - - 25.11.2015 - -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798) - - 02.11.2015 - - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102 - - 01.11.2015 - - update config file processing - - 31.10.2015 - - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751) - - 29.10.2015 - - improve template scope handling - - 24.10.2015 - - more optimizations of template processing - - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100 - - 21.10.2015 - - move some code into runtime extensions - - 18.10.2015 - - optimize filepath normalization - - rework of template inheritance - - speed and size optimizations - - bugfix under HHVM temporary cache file must only be created when caches template was updated - - fix compiled code for new {block} assign attribute - - update code generated by template function call handler - - 18.09.2015 - - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92 - - 17.09.2015 - - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90 - - 16.09.2015 - - update compiler by moving no longer needed properties, code optimizations and other - - 14.09.2015 - - optimize autoloader - - optimize subtemplate handling - - update template inheritance processing - - move code of {call} processing back into Smarty_Internal_Template class - - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557) - - bugfix unintended multiple debug windows (forum topic 25699) - - 30.08.2015 - - size optimization move some runtime functions into extension - - optimize inline template processing - - optimization merge inheritance child and parent templates into one compiled template file - - 29.08.2015 - - improvement convert template inheritance into runtime processing - - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68 - - 23.08.2015 - - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop - - load seldom used Smarty API methods dynamically to reduce memory footprint - - cache template object of {include} if same template is included several times - - convert debug console processing to object - - use output buffers for better performance and less memory usage - - optimize nocache hash processing - - remove not really needed properties - - optimize rendering - - move caching to Smarty::_cache - - remove properties with redundant content - - optimize Smarty::templateExists() - - optimize use_include_path processing - - relocate properties for size optimization - - remove redundant code - - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77 - - 06.08.2015 - - avoid possible circular object references caused by parser/lexer objects - - rewrite compileAll... utility methods - - commit several internal improvements - - bugfix Smarty failed when compile_id did contain "|" - - 03.08.2015 - - rework clear cache methods - - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing - - improve getIncludePath() to return directory if no file was given - - 02.08.2015 - - optimization and code cleanup of {foreach} and {section} compiler - - rework {capture} compiler - - 01.08.2015 - - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75 - - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630) - - 31.07.2015 - - optimize {foreach} and {section} compiler - - 29.07.2015 - - optimize {section} compiler for speed and size of compiled code - - 28.07.2015 - - update for PHP 7 compatibility - - 26.07.2015 - - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797 - - 25.07.2015 - - bugfix parser did hang on text starting fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70 - - improvement Added $limit parameter to regex_replace modifier #71 - - new feature multiple indices on file: resource - - 06.07.2015 - - optimize {block} compilation - - optimization get rid of __get and __set in source object - - 01.07.2015 - - optimize compile check handling - - update {foreach} compiler - - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66 - - optimize source resources - - 28.06.2015 - - move $smarty->enableSecurity() into Smarty_Security class - - optimize security isTrustedResourceDir() - - move auto load filter methods into extension - - move $smarty->getTemplateVars() into extension - - move getStreamVariable() into extension - - move $smarty->append() and $smarty->appendByRef() into extension - - optimize autoloader - - optimize file path normalization - - bugfix PATH_SEPARATOR was replaced by mistake in autoloader - - remove redundant code - - 27.06.2015 - - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64 - - update $smarty->_realpath for relative path not starting with './' - - update Smarty security with new realpath handling - - update {include_php} with new realpath handling - - move $smarty->loadPlugin() into extension - - minor compiler optimizations - - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52 - - rework of $smarty->clearCompiledTemplate() and move it to its own extension - - 19.06.2015 - - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59 - - ===== 3.1.27===== (18.06.2015) - 18.06.2015 - - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 - - ===== 3.1.26===== (18.06.2015) - 18.06.2015 - - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 - - 17.06.2015 - - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55 - - ===== 3.1.25===== (15.06.2015) - 15.06.2015 - - optimization of smarty_cachereource_keyvaluestore.php code - - 14.06.2015 - - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50 - - optimization rework of path normalization - - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53 - - 13.06.2015 - - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568) - - 11.06.2015 - - bugfix the lexer could hang on very large quoted strings (forum topic 25570) - - 08.06.2015 - - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49 - - 04.06.2015 - - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46 - - 01.06.2015 - - bugfix including template variables broken since 3.1.22 https://github.com/smarty-php/smarty/issues/47 - - 27.05.2015 - - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43 - - 24.05.2015 - - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42 - - ===== 3.1.24===== (23.05.2015) - 23.05.2015 - - improvement on php_handling to allow very large PHP sections, better error handling - - improvement allow extreme large comment sections (forum 25538) - - 21.05.2015 - - bugfix broken PHP 5.2 compatibility when compiling 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41 - - 19.05.2015 - - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39 - - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220) - - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538) - - 18.05.2015 - - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher - compilation speed - - 16.05.2015 - - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33 - - improvement remove not needed ?> handling from parser to new compiler module - - 05.05.2015 - - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23 - - 04.05.2015 - - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22) - - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24) - - 28.04.2015 - - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix - - 28.04.2015 - - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) - - 23.04.2015 - - bugfix a nocache template variable used as parameter at {insert} was by mistake cached - - 20.04.2015 - - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name - - 27.03.2015 - - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015) - - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471) - - 20.03.2015 - - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452} - - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers) - - 16.03.2015 - - bugfix problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452} - - bugfix Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457} - - bugfix {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18 - - - 15.03.2015 - - bugfix $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452} - - 14.03.2015 - - bugfix {nocache} {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable. - - - bugfix template functions defined with {function} in an included subtemplate could not be called in nocache - mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452} - - 10.03.2015 - - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode. - - 12.02.2015 - - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error - - 11.02.2015 - - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16) - - 22.01.2015 - - new feature security can now control access to static methods and properties - see also NEW_FEATURES.txt - - 21.01.2015 - - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397) - - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class - - 04.01.2015 - - push last weeks changes to github - - - different optimizations - - improvement automatically create different versions of compiled templates and config files depending - on property settings. - - optimization restructure template processing by moving code into classes it better belongs to - - optimization restructure config file processing - - 31.12.2014 - - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. - Function mb_split could be overloaded depending on php.ini mbstring.func_overload - - - 29.12.2014 - - new feature security can now limit the template nesting level by property $max_template_nesting - see also NEW_FEATURES.txt (forum 25370) - - 29.12.2014 - - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars - see also NEW_FEATURES.txt (forum 25370) - - 27.12.2014 - - bugfix clear internal _is_file_cache when plugins_dir was modified - - 13.12.2014 - - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed - - 11.12.2014 - - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014 - - 09.12.2014 - - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342) - - bugfix call of template function by a variable name did not work after latest changes (forum 25342) - - 23.11.2014 - - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326) - - 13.11.2014 - - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible - - 12.11.2014 - - new feature added support of namespaces to template code - - 08.11.2014 - 10.11.2014 - - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates - - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014) - - bugfix Debug Console did not include all data from merged compiled subtemplates - - 04.11.2014 - - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour) - $smarty->debugging = 2; => individual Debug Console window by template name - - 03.11.2014 - - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301) - - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console - (ATTENTION: parameter order has changed to be able to specify maximum recursion) - - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true - - improvement The template variables are no longer displayed as objects on the Debug Console - - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console - - addition of some hooks for future extension of Debug Console - - 01.11.2014 - - bugfix and enhancement on subtemplate {include} and template {function} tags. - * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate. - * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems - * Many smaller related changes - - 30.10.2014 - - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301) - - 26.10.2014 - - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text - - bugfix merge_compiled_includes option failed when caching enables and same subtemplate was included cached and not cached - - ===== 3.1.21 ===== (18.10.2014) - 18.10.2014 - - composer moved to github - - 17.10.2014 - - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen) - - 16.10.2014 - - bugfix composer.json update - - 15.10.2014 - - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350) - - 14.10.2014 - - bugfix any tag placed within " diff --git a/library/Smarty/libs/plugins/block.textformat.php b/library/Smarty/libs/plugins/block.textformat.php deleted file mode 100644 index abf544939..000000000 --- a/library/Smarty/libs/plugins/block.textformat.php +++ /dev/null @@ -1,110 +0,0 @@ - - * Name: textformat
- * Purpose: format text a certain way with preset styles - * or custom wrap/indent settings
- * Params: - * 
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- *
- * - * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} - * (Smarty online manual) - * - * @param array $params parameters - * @param string $content contents of the block - * @param Smarty_Internal_Template $template template object - * @param boolean &$repeat repeat flag - * - * @return string content re-formatted - * @author Monte Ohrt - */ -function smarty_block_textformat($params, $content, $template, &$repeat) -{ - if (is_null($content)) { - return; - } - - $style = null; - $indent = 0; - $indent_first = 0; - $indent_char = ' '; - $wrap = 80; - $wrap_char = "\n"; - $wrap_cut = false; - $assign = null; - - foreach ($params as $_key => $_val) { - switch ($_key) { - case 'style': - case 'indent_char': - case 'wrap_char': - case 'assign': - $$_key = (string) $_val; - break; - - case 'indent': - case 'indent_first': - case 'wrap': - $$_key = (int) $_val; - break; - - case 'wrap_cut': - $$_key = (bool) $_val; - break; - - default: - trigger_error("textformat: unknown attribute '$_key'"); - } - } - - if ($style == 'email') { - $wrap = 72; - } - // split into paragraphs - $_paragraphs = preg_split('![\r\n]{2}!', $content); - - foreach ($_paragraphs as &$_paragraph) { - if (!$_paragraph) { - continue; - } - // convert mult. spaces & special chars to single space - $_paragraph = preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), array(' ', ''), $_paragraph); - // indent first line - if ($indent_first > 0) { - $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph; - } - // wordwrap sentences - if (Smarty::$_MBSTRING) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'); - $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } else { - $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } - // indent lines - if ($indent > 0) { - $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph); - } - } - $_output = implode($wrap_char . $wrap_char, $_paragraphs); - - if ($assign) { - $template->assign($assign, $_output); - } else { - return $_output; - } -} diff --git a/library/Smarty/libs/plugins/function.counter.php b/library/Smarty/libs/plugins/function.counter.php deleted file mode 100644 index 4da85a14e..000000000 --- a/library/Smarty/libs/plugins/function.counter.php +++ /dev/null @@ -1,78 +0,0 @@ - - * Name: counter
- * Purpose: print out a counter value - * - * @author Monte Ohrt - * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} - * (Smarty online manual) - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @return string|null - */ -function smarty_function_counter($params, $template) -{ - static $counters = array(); - - $name = (isset($params['name'])) ? $params['name'] : 'default'; - if (!isset($counters[$name])) { - $counters[$name] = array( - 'start' => 1, - 'skip' => 1, - 'direction' => 'up', - 'count' => 1 - ); - } - $counter =& $counters[$name]; - - if (isset($params['start'])) { - $counter['start'] = $counter['count'] = (int) $params['start']; - } - - if (!empty($params['assign'])) { - $counter['assign'] = $params['assign']; - } - - if (isset($counter['assign'])) { - $template->assign($counter['assign'], $counter['count']); - } - - if (isset($params['print'])) { - $print = (bool) $params['print']; - } else { - $print = empty($counter['assign']); - } - - if ($print) { - $retval = $counter['count']; - } else { - $retval = null; - } - - if (isset($params['skip'])) { - $counter['skip'] = $params['skip']; - } - - if (isset($params['direction'])) { - $counter['direction'] = $params['direction']; - } - - if ($counter['direction'] == "down") { - $counter['count'] -= $counter['skip']; - } else { - $counter['count'] += $counter['skip']; - } - - return $retval; -} diff --git a/library/Smarty/libs/plugins/function.cycle.php b/library/Smarty/libs/plugins/function.cycle.php deleted file mode 100644 index 8dc5cd9d5..000000000 --- a/library/Smarty/libs/plugins/function.cycle.php +++ /dev/null @@ -1,107 +0,0 @@ - - * Name: cycle
- * Date: May 3, 2002
- * Purpose: cycle through given values
- * Params: - * 
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- *
- * Examples:
- * 
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- *
- * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} - * (Smarty online manual) - * @author Monte Ohrt - * @author credit to Mark Priatel - * @author credit to Gerard - * @author credit to Jason Sweat - * @version 1.3 - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @return string|null - */ - -function smarty_function_cycle($params, $template) -{ - static $cycle_vars; - - $name = (empty($params['name'])) ? 'default' : $params['name']; - $print = (isset($params['print'])) ? (bool) $params['print'] : true; - $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true; - $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false; - - if (!isset($params['values'])) { - if (!isset($cycle_vars[$name]['values'])) { - trigger_error("cycle: missing 'values' parameter"); - - return; - } - } else { - if (isset($cycle_vars[$name]['values']) - && $cycle_vars[$name]['values'] != $params['values'] - ) { - $cycle_vars[$name]['index'] = 0; - } - $cycle_vars[$name]['values'] = $params['values']; - } - - if (isset($params['delimiter'])) { - $cycle_vars[$name]['delimiter'] = $params['delimiter']; - } elseif (!isset($cycle_vars[$name]['delimiter'])) { - $cycle_vars[$name]['delimiter'] = ','; - } - - if (is_array($cycle_vars[$name]['values'])) { - $cycle_array = $cycle_vars[$name]['values']; - } else { - $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']); - } - - if (!isset($cycle_vars[$name]['index']) || $reset) { - $cycle_vars[$name]['index'] = 0; - } - - if (isset($params['assign'])) { - $print = false; - $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); - } - - if ($print) { - $retval = $cycle_array[$cycle_vars[$name]['index']]; - } else { - $retval = null; - } - - if ($advance) { - if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) { - $cycle_vars[$name]['index'] = 0; - } else { - $cycle_vars[$name]['index'] ++; - } - } - - return $retval; -} diff --git a/library/Smarty/libs/plugins/function.fetch.php b/library/Smarty/libs/plugins/function.fetch.php deleted file mode 100644 index 3506d4a8d..000000000 --- a/library/Smarty/libs/plugins/function.fetch.php +++ /dev/null @@ -1,221 +0,0 @@ - - * Name: fetch
- * Purpose: fetch file, web or ftp data and display results - * - * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} - * (Smarty online manual) - * @author Monte Ohrt - * - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * - * @throws SmartyException - * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable - */ -function smarty_function_fetch($params, $template) -{ - if (empty($params['file'])) { - trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE); - - return; - } - - // strip file protocol - if (stripos($params['file'], 'file://') === 0) { - $params['file'] = substr($params['file'], 7); - } - - $protocol = strpos($params['file'], '://'); - if ($protocol !== false) { - $protocol = strtolower(substr($params['file'], 0, $protocol)); - } - - if (isset($template->smarty->security_policy)) { - if ($protocol) { - // remote resource (or php stream, …) - if (!$template->smarty->security_policy->isTrustedUri($params['file'])) { - return; - } - } else { - // local file - if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { - return; - } - } - } - - $content = ''; - if ($protocol == 'http') { - // http fetch - if ($uri_parts = parse_url($params['file'])) { - // set defaults - $host = $server_name = $uri_parts['host']; - $timeout = 30; - $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION; - $referer = ""; - $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; - $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; - $_is_proxy = false; - if (empty($uri_parts['port'])) { - $port = 80; - } else { - $port = $uri_parts['port']; - } - if (!empty($uri_parts['user'])) { - $user = $uri_parts['user']; - } - if (!empty($uri_parts['pass'])) { - $pass = $uri_parts['pass']; - } - // loop through parameters, setup headers - foreach ($params as $param_key => $param_value) { - switch ($param_key) { - case "file": - case "assign": - case "assign_headers": - break; - case "user": - if (!empty($param_value)) { - $user = $param_value; - } - break; - case "pass": - if (!empty($param_value)) { - $pass = $param_value; - } - break; - case "accept": - if (!empty($param_value)) { - $accept = $param_value; - } - break; - case "header": - if (!empty($param_value)) { - if (!preg_match('![\w\d-]+: .+!', $param_value)) { - trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE); - - return; - } else { - $extra_headers[] = $param_value; - } - } - break; - case "proxy_host": - if (!empty($param_value)) { - $proxy_host = $param_value; - } - break; - case "proxy_port": - if (!preg_match('!\D!', $param_value)) { - $proxy_port = (int) $param_value; - } else { - trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - break; - case "agent": - if (!empty($param_value)) { - $agent = $param_value; - } - break; - case "referer": - if (!empty($param_value)) { - $referer = $param_value; - } - break; - case "timeout": - if (!preg_match('!\D!', $param_value)) { - $timeout = (int) $param_value; - } else { - trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - break; - default: - trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE); - - return; - } - } - if (!empty($proxy_host) && !empty($proxy_port)) { - $_is_proxy = true; - $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout); - } else { - $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout); - } - - if (!$fp) { - trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE); - - return; - } else { - if ($_is_proxy) { - fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n"); - } else { - fputs($fp, "GET $uri HTTP/1.0\r\n"); - } - if (!empty($host)) { - fputs($fp, "Host: $host\r\n"); - } - if (!empty($accept)) { - fputs($fp, "Accept: $accept\r\n"); - } - if (!empty($agent)) { - fputs($fp, "User-Agent: $agent\r\n"); - } - if (!empty($referer)) { - fputs($fp, "Referer: $referer\r\n"); - } - if (isset($extra_headers) && is_array($extra_headers)) { - foreach ($extra_headers as $curr_header) { - fputs($fp, $curr_header . "\r\n"); - } - } - if (!empty($user) && !empty($pass)) { - fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n"); - } - - fputs($fp, "\r\n"); - while (!feof($fp)) { - $content .= fgets($fp, 4096); - } - fclose($fp); - $csplit = preg_split("!\r\n\r\n!", $content, 2); - - $content = $csplit[1]; - - if (!empty($params['assign_headers'])) { - $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0])); - } - } - } else { - trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE); - - return; - } - } else { - $content = @file_get_contents($params['file']); - if ($content === false) { - throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'"); - } - } - - if (!empty($params['assign'])) { - $template->assign($params['assign'], $content); - } else { - return $content; - } -} diff --git a/library/Smarty/libs/plugins/function.html_checkboxes.php b/library/Smarty/libs/plugins/function.html_checkboxes.php deleted file mode 100644 index d78680368..000000000 --- a/library/Smarty/libs/plugins/function.html_checkboxes.php +++ /dev/null @@ -1,237 +0,0 @@ - - * Type: function
- * Name: html_checkboxes
- * Date: 24.Feb.2003
- * Purpose: Prints out a list of checkbox input types
- * Examples: - * 
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='
' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='
' output=$names}
- *
- * Params: - * 
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie 
 or  
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- *
- * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} - * (Smarty online manual) - * @author Christopher Kvarme - * @author credits to Monte Ohrt - * @version 1.0 - * - * @param array $params parameters - * @param object $template template object - * - * @return string - * @uses smarty_function_escape_special_chars() - */ -function smarty_function_html_checkboxes($params, $template) -{ - require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'); - - $name = 'checkbox'; - $values = null; - $options = null; - $selected = array(); - $separator = ''; - $escape = true; - $labels = true; - $label_ids = false; - $output = null; - - $extra = ''; - - foreach ($params as $_key => $_val) { - switch ($_key) { - case 'name': - case 'separator': - $$_key = (string) $_val; - break; - - case 'escape': - case 'labels': - case 'label_ids': - $$_key = (bool) $_val; - break; - - case 'options': - $$_key = (array) $_val; - break; - - case 'values': - case 'output': - $$_key = array_values((array) $_val); - break; - - case 'checked': - case 'selected': - if (is_array($_val)) { - $selected = array(); - foreach ($_val as $_sel) { - if (is_object($_sel)) { - if (method_exists($_sel, "__toString")) { - $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); - } else { - trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE); - continue; - } - } else { - $_sel = smarty_function_escape_special_chars((string) $_sel); - } - $selected[$_sel] = true; - } - } elseif (is_object($_val)) { - if (method_exists($_val, "__toString")) { - $selected = smarty_function_escape_special_chars((string) $_val->__toString()); - } else { - trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); - } - } else { - $selected = smarty_function_escape_special_chars((string) $_val); - } - break; - - case 'checkboxes': - trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING); - $options = (array) $_val; - break; - - case 'assign': - break; - - case 'strict': - break; - - case 'disabled': - case 'readonly': - if (!empty($params['strict'])) { - if (!is_scalar($_val)) { - trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE); - } - - if ($_val === true || $_val === $_key) { - $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"'; - } - - break; - } - // omit break; to fall through! - - default: - if (!is_array($_val)) { - $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; - } else { - trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } - break; - } - } - - if (!isset($options) && !isset($values)) { - return ''; - } /* raise error here? */ - - $_html_result = array(); - - if (isset($options)) { - foreach ($options as $_key => $_val) { - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); - } - } else { - foreach ($values as $_i => $_key) { - $_val = isset($output[$_i]) ? $output[$_i] : ''; - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); - } - } - - if (!empty($params['assign'])) { - $template->assign($params['assign'], $_html_result); - } else { - return implode("\n", $_html_result); - } -} - -function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true) -{ - $_output = ''; - - if (is_object($value)) { - if (method_exists($value, "__toString")) { - $value = (string) $value->__toString(); - } else { - trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE); - - return ''; - } - } else { - $value = (string) $value; - } - - if (is_object($output)) { - if (method_exists($output, "__toString")) { - $output = (string) $output->__toString(); - } else { - trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE); - - return ''; - } - } else { - $output = (string) $output; - } - - if ($labels) { - if ($label_ids) { - $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value)); - $_output .= '