Merge pull request #10796 from MrPetovan/task/10754-add-revoke-function

Add revoke follow feature
This commit is contained in:
Tobias Diekershoff 2021-10-02 20:30:20 +02:00 committed by GitHub
commit 3a30f90324
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 563 additions and 256 deletions

View file

@ -479,6 +479,22 @@ Hook data:
- **uid** (input): the user to return the contact data for (can be empty for public contacts).
- **result** (output): Set by the hook function to indicate a successful detection.
### support_follow
Called to assert whether a connector addon provides follow capabilities.
Hook data:
- **protocol** (input): shorthand for the protocol. List of values is available in `src/Core/Protocol.php`.
- **result** (output): should be true if the connector provides follow capabilities, left alone otherwise.
### support_revoke_follow
Called to assert whether a connector addon provides follow revocation capabilities.
Hook data:
- **protocol** (input): shorthand for the protocol. List of values is available in `src/Core/Protocol.php`.
- **result** (output): should be true if the connector provides follow revocation capabilities, left alone otherwise.
### follow
Called before adding a new contact for a user to handle non-native network remote contact (like Twitter).
@ -497,6 +513,14 @@ Hook data:
- **two_way** (input): wether to stop sharing with the remote contact as well.
- **result** (output): wether the unfollowing is successful or not.
### revoke_follow
Called when making a remote contact on a non-native network (like Twitter) unfollow you.
Hook data:
- **contact** (input): the remote contact (uid = local revoking user id) array.
- **result** (output): a boolean value indicating wether the operation was successful or not.
## Complete list of hook callbacks
Here is a complete list of all hook callbacks with file locations (as of 24-Sep-2018). Please see the source for details of any hooks not documented above.
@ -666,7 +690,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('contact_photo_menu', $args);
Hook::callAll('follow', $arr);
Hook::callAll('unfollow', $hook_data);
### src/Model/Profile.php
@ -750,6 +773,13 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
Hook::callAll('logged_in', $a->user);
### src/Core/Protocol.php
Hook::callAll('support_follow', $hook_data);
Hook::callAll('support_revoke_follow', $hook_data);
Hook::callAll('unfollow', $hook_data);
Kook::callAll('revoke_follow', $hook_data);
### src/Core/StorageManager
Hook::callAll('storage_instance', $data);

View file

@ -356,7 +356,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
Hook::callAll('contact_photo_menu', $args);
Hook::callAll('follow', $arr);
Hook::callAll('unfollow', $hook_data);
### src/Model/Profile.php
@ -413,7 +412,14 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
### src/Core/Authentication.php
Hook::callAll('logged_in', $a->user);
### src/Core/Protocol.php
Hook::callAll('support_follow', $hook_data);
Hook::callAll('support_revoke_follow', $hook_data);
Hook::callAll('unfollow', $hook_data);
Kook::callAll('revoke_follow', $hook_data);
### src/Core/StorageManager
Hook::callAll('storage_instance', $data);

View file

@ -1020,13 +1020,15 @@ function photos_content(App $a)
$drop_url = DI::args()->getQueryString();
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
'$message' => DI::l10n()->t('Do you really want to delete this photo album and all its photos?'),
'$confirm' => DI::l10n()->t('Delete Album'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum',
'$l10n' => [
'message' => DI::l10n()->t('Do you really want to delete this photo album and all its photos?'),
'confirm' => DI::l10n()->t('Delete Album'),
'cancel' => DI::l10n()->t('Cancel'),
],
'$method' => 'post',
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum',
'$confirm_value' => 'dropalbum',
'$cancel' => DI::l10n()->t('Cancel'),
]);
}
@ -1127,13 +1129,15 @@ function photos_content(App $a)
$drop_url = DI::args()->getQueryString();
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
'$message' => DI::l10n()->t('Do you really want to delete this photo?'),
'$confirm' => DI::l10n()->t('Delete Photo'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'delete',
'$l10n' => [
'message' => DI::l10n()->t('Do you really want to delete this photo?'),
'confirm' => DI::l10n()->t('Delete Photo'),
'cancel' => DI::l10n()->t('Cancel'),
],
'$method' => 'post',
'$confirm_url' => $drop_url,
'$confirm_name' => 'delete',
'$confirm_value' => 'delete',
'$cancel' => DI::l10n()->t('Cancel'),
]);
}

View file

@ -71,6 +71,44 @@ class Protocol
const PHANTOM = 'unkn'; // Place holder
/**
* Returns whether the provided protocol supports following
*
* @param $protocol
* @return bool
* @throws HTTPException\InternalServerErrorException
*/
public static function supportsFollow($protocol): bool
{
if (in_array($protocol, self::NATIVE_SUPPORT)) {
return true;
}
$result = null;
Hook::callAll('support_follow', $result);
return $result === true;
}
/**
* Returns whether the provided protocol supports revoking inbound follows
*
* @param $protocol
* @return bool
* @throws HTTPException\InternalServerErrorException
*/
public static function supportsRevokeFollow($protocol): bool
{
if (in_array($protocol, self::NATIVE_SUPPORT)) {
return true;
}
$result = null;
Hook::callAll('support_revoke_follow', $result);
return $result === true;
}
/**
* Returns the address string for the provided profile URL
*
@ -212,7 +250,7 @@ class Protocol
return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
}
// Catch-all addon hook
// Catch-all hook for connector addons
$hook_data = [
'contact' => $contact,
'two_way' => $two_way,
@ -222,4 +260,36 @@ class Protocol
return $hook_data['result'];
}
/**
* Revoke an incoming follow from the provided contact
*
* @param array $contact Private contact (uid != 0) array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function revokeFollow(array $contact)
{
if (empty($contact['network'])) {
throw new \InvalidArgumentException('Missing network key in contact array');
}
$protocol = $contact['network'];
if ($protocol == Protocol::DFRN && !empty($contact['protocol'])) {
$protocol = $contact['protocol'];
}
if ($protocol == Protocol::ACTIVITYPUB) {
return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $contact['uid']);
}
// Catch-all hook for connector addons
$hook_data = [
'contact' => $contact,
'result' => null,
];
Hook::callAll('revoke_follow', $hook_data);
return $hook_data['result'];
}
}

View file

@ -849,6 +849,36 @@ class Contact
return $result;
}
/**
* Revoke follow privileges of the remote user contact
*
* @param array $contact Contact unfriended
* @return bool|null Whether the remote operation is successful or null if no remote operation was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function revokeFollow(array $contact): bool
{
if (empty($contact['network'])) {
throw new \InvalidArgumentException('Empty network in contact array');
}
if (empty($contact['uid'])) {
throw new \InvalidArgumentException('Unexpected public contact record');
}
$result = Protocol::revokeFollow($contact);
// A null value here means the remote network doesn't support explicit follow revocation, we can still
// break the locally recorded relationship
if ($result !== false) {
DBA::update('contact', ['rel' => $contact['rel'] == self::FRIEND ? self::SHARING : self::NOTHING], ['id' => $contact['id']]);
}
return $result;
}
/**
* Marks a contact for archival after a communication issue delay
*
@ -1022,7 +1052,7 @@ class Contact
$follow_link = '';
$unfollow_link = '';
if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
$unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1';
} elseif(!$contact['pending']) {

View file

@ -432,15 +432,17 @@ class Contact extends BaseModule
DI::page()['aside'] = '';
return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
'$header' => DI::l10n()->t('Drop contact'),
'$l10n' => [
'header' => DI::l10n()->t('Drop contact'),
'message' => DI::l10n()->t('Do you really want to delete this contact?'),
'confirm' => DI::l10n()->t('Yes'),
'cancel' => DI::l10n()->t('Cancel'),
],
'$contact' => self::getContactTemplateVars($orig_record),
'$method' => 'get',
'$message' => DI::l10n()->t('Do you really want to delete this contact?'),
'$confirm' => DI::l10n()->t('Yes'),
'$confirm_url' => DI::args()->getCommand(),
'$confirm_name' => 't',
'$confirm_value' => BaseModule::getFormSecurityToken('contact_action'),
'$cancel' => DI::l10n()->t('Cancel'),
]);
}
// Now check how the user responded to the confirmation query
@ -1146,6 +1148,16 @@ class Contact extends BaseModule
];
if ($contact['uid'] != 0) {
if (Protocol::supportsRevokeFollow($contact['network']) && in_array($contact['rel'], [Model\Contact::FOLLOWER, Model\Contact::FRIEND])) {
$contact_actions['revoke_follow'] = [
'label' => DI::l10n()->t('Revoke Follow'),
'url' => 'contact/' . $contact['id'] . '/revoke',
'title' => DI::l10n()->t('Revoke the follow from this contact'),
'sel' => '',
'id' => 'revoke_follow',
];
}
$contact_actions['delete'] = [
'label' => DI::l10n()->t('Delete'),
'url' => 'contact/' . $contact['id'] . '/drop?t=' . $formSecurityToken,

View file

@ -0,0 +1,108 @@
<?php
/**
* @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
namespace Friendica\Module\Contact;
use Friendica\BaseModule;
use Friendica\Content\Nav;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model;
use Friendica\Module\Contact;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
class Revoke extends BaseModule
{
/** @var array */
private static $contact;
public static function init(array $parameters = [])
{
if (!local_user()) {
return;
}
$data = Model\Contact::getPublicAndUserContactID($parameters['id'], local_user());
if (!DBA::isResult($data)) {
throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown contact.'));
}
if (empty($data['user'])) {
throw new HTTPException\ForbiddenException();
}
self::$contact = Model\Contact::getById($data['user']);
if (self::$contact['deleted']) {
throw new HTTPException\NotFoundException(DI::l10n()->t('Contact is deleted.'));
}
if (!empty(self::$contact['network']) && self::$contact['network'] == Protocol::PHANTOM) {
throw new HTTPException\NotFoundException(DI::l10n()->t('Contact is being deleted.'));
}
}
public static function post(array $parameters = [])
{
if (!local_user()) {
throw new HTTPException\UnauthorizedException();
}
self::checkFormSecurityTokenRedirectOnError('contact/' . $parameters['id'], 'contact_revoke');
$result = Model\Contact::revokeFollow(self::$contact);
if ($result === true) {
notice(DI::l10n()->t('Follow was successfully revoked.'));
} elseif ($result === null) {
notice(DI::l10n()->t('Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'));
} else {
notice(DI::l10n()->t('Unable to revoke follow, please try again later or contact the administrator.'));
}
DI::baseUrl()->redirect('contact/' . $parameters['id']);
}
public static function content(array $parameters = []): string
{
if (!local_user()) {
return Login::form($_SERVER['REQUEST_URI']);
}
Nav::setSelected('contact');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
'$l10n' => [
'header' => DI::l10n()->t('Revoke Follow'),
'message' => DI::l10n()->t('Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'),
'confirm' => DI::l10n()->t('Yes'),
'cancel' => DI::l10n()->t('Cancel'),
],
'$contact' => Contact::getContactTemplateVars(self::$contact),
'$method' => 'post',
'$confirm_url' => DI::args()->getCommand(),
'$confirm_name' => 'form_security_token',
'$confirm_value' => BaseModule::getFormSecurityToken('contact_revoke'),
]);
}
}

View file

@ -1037,9 +1037,12 @@ class Processor
self::switchContact($cid);
if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING])) {
$contact = Contact::getById($cid, ['rel']);
if ($contact['rel'] == Contact::SHARING) {
Contact::remove($cid);
Logger::info('Rejected contact request - contact removed', ['contact' => $cid, 'user' => $uid]);
} elseif ($contact['rel'] == Contact::FRIEND) {
Contact::update(['rel' => Contact::FOLLOWER], ['id' => $cid]);
} else {
Logger::info('Rejected contact request', ['contact' => $cid, 'user' => $uid]);
}

View file

@ -2047,15 +2047,16 @@ class Transmitter
* @param string $target Target profile
* @param $id
* @param integer $uid User ID
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @return bool Operation success
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function sendContactReject($target, $id, $uid)
public static function sendContactReject($target, $id, $uid): bool
{
$profile = APContact::getByURL($target);
if (empty($profile['inbox'])) {
Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
return;
return false;
}
$owner = User::getOwnerDataById($uid);
@ -2075,7 +2076,7 @@ class Transmitter
Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
}
/**

View file

@ -239,6 +239,7 @@ return [
'/{id:\d+}/ignore' => [Module\Contact::class, [R::GET]],
'/{id:\d+}/poke' => [Module\Contact\Poke::class, [R::GET, R::POST]],
'/{id:\d+}/posts' => [Module\Contact::class, [R::GET]],
'/{id:\d+}/revoke' => [Module\Contact\Revoke::class, [R::GET, R::POST]],
'/{id:\d+}/update' => [Module\Contact::class, [R::GET]],
'/{id:\d+}/updateprofile' => [Module\Contact::class, [R::GET]],
'/archived' => [Module\Contact::class, [R::GET]],

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2021.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-02 08:34-0400\n"
"POT-Creation-Date: 2021-10-02 13:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,7 +38,7 @@ msgid "Monthly posting limit of %d post reached. The post was rejected."
msgstr ""
#: include/api.php:4430 mod/photos.php:89 mod/photos.php:198 mod/photos.php:626
#: mod/photos.php:1035 mod/photos.php:1052 mod/photos.php:1599
#: mod/photos.php:1037 mod/photos.php:1054 mod/photos.php:1603
#: src/Model/User.php:1169 src/Model/User.php:1177 src/Model/User.php:1185
#: src/Module/Settings/Profile/Photo/Crop.php:101
#: src/Module/Settings/Profile/Photo/Crop.php:117
@ -447,7 +447,7 @@ msgstr ""
msgid "Save"
msgstr ""
#: mod/editpost.php:92 mod/photos.php:1375 src/Content/Conversation.php:326
#: mod/editpost.php:92 mod/photos.php:1379 src/Content/Conversation.php:326
#: src/Module/Contact/Poke.php:157 src/Object/Post.php:964
msgid "Loading..."
msgstr ""
@ -512,7 +512,7 @@ msgid "clear location"
msgstr ""
#: mod/editpost.php:107 mod/message.php:203 mod/message.php:368
#: mod/photos.php:1526 mod/wallmessage.php:155 src/Content/Conversation.php:355
#: mod/photos.php:1530 mod/wallmessage.php:155 src/Content/Conversation.php:355
#: src/Content/Conversation.php:689 src/Module/Item/Compose.php:165
#: src/Object/Post.php:502
msgid "Please wait"
@ -544,16 +544,17 @@ msgstr ""
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
#: mod/editpost.php:128 mod/events.php:578 mod/photos.php:1374
#: mod/photos.php:1430 mod/photos.php:1504 src/Content/Conversation.php:370
#: mod/editpost.php:128 mod/events.php:578 mod/photos.php:1378
#: mod/photos.php:1434 mod/photos.php:1508 src/Content/Conversation.php:370
#: src/Module/Item/Compose.php:160 src/Object/Post.php:974
msgid "Preview"
msgstr ""
#: mod/editpost.php:130 mod/fbrowser.php:105 mod/fbrowser.php:134
#: mod/follow.php:144 mod/photos.php:1029 mod/photos.php:1136 mod/tagrm.php:37
#: mod/follow.php:144 mod/photos.php:1026 mod/photos.php:1135 mod/tagrm.php:37
#: mod/tagrm.php:129 mod/unfollow.php:97 src/Content/Conversation.php:373
#: src/Module/Contact.php:443 src/Module/RemoteFollow.php:116
#: src/Module/Contact.php:439 src/Module/Contact/Revoke.php:99
#: src/Module/RemoteFollow.php:116
msgid "Cancel"
msgstr ""
@ -569,7 +570,7 @@ msgid "Browser"
msgstr ""
#: mod/editpost.php:136 mod/events.php:583 mod/photos.php:965
#: mod/photos.php:1328 src/Content/Conversation.php:357
#: mod/photos.php:1332 src/Content/Conversation.php:357
msgid "Permissions"
msgstr ""
@ -638,7 +639,7 @@ msgstr ""
#: mod/events.php:568 src/Content/Widget/VCard.php:98 src/Model/Event.php:86
#: src/Model/Event.php:113 src/Model/Event.php:483 src/Model/Event.php:969
#: src/Model/Profile.php:367 src/Module/Contact.php:623
#: src/Model/Profile.php:367 src/Module/Contact.php:625
#: src/Module/Directory.php:150 src/Module/Notifications/Introductions.php:166
#: src/Module/Profile/Profile.php:194
msgid "Location:"
@ -653,9 +654,9 @@ msgid "Share this event"
msgstr ""
#: mod/events.php:580 mod/message.php:204 mod/message.php:367
#: mod/photos.php:947 mod/photos.php:1046 mod/photos.php:1332
#: mod/photos.php:1373 mod/photos.php:1429 mod/photos.php:1503
#: src/Module/Admin/Item/Source.php:65 src/Module/Contact.php:581
#: mod/photos.php:947 mod/photos.php:1048 mod/photos.php:1336
#: mod/photos.php:1377 mod/photos.php:1433 mod/photos.php:1507
#: src/Module/Admin/Item/Source.php:65 src/Module/Contact.php:583
#: src/Module/Contact/Advanced.php:133 src/Module/Contact/Poke.php:158
#: src/Module/Debug/ActivityPubConversion.php:141
#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
@ -674,7 +675,7 @@ msgstr ""
msgid "Basic"
msgstr ""
#: mod/events.php:582 src/Module/Admin/Site.php:505 src/Module/Contact.php:932
#: mod/events.php:582 src/Module/Admin/Site.php:505 src/Module/Contact.php:934
#: src/Module/Profile/Profile.php:249
msgid "Advanced"
msgstr ""
@ -718,7 +719,7 @@ msgid "OStatus support is disabled. Contact can't be added."
msgstr ""
#: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
#: src/Model/Contact.php:1046 src/Model/Contact.php:1059
#: src/Model/Contact.php:1076 src/Model/Contact.php:1089
#: view/theme/vier/theme.php:172
msgid "Connect/Follow"
msgstr ""
@ -732,13 +733,13 @@ msgid "Your Identity Address:"
msgstr ""
#: mod/follow.php:141 mod/unfollow.php:100
#: src/Module/Admin/Blocklist/Contact.php:100 src/Module/Contact.php:619
#: src/Module/Admin/Blocklist/Contact.php:100 src/Module/Contact.php:621
#: src/Module/Notifications/Introductions.php:108
#: src/Module/Notifications/Introductions.php:177
msgid "Profile URL"
msgstr ""
#: mod/follow.php:142 src/Module/Contact.php:631
#: mod/follow.php:142 src/Module/Contact.php:633
#: src/Module/Notifications/Introductions.php:170
#: src/Module/Profile/Profile.php:207
msgid "Tags:"
@ -754,7 +755,7 @@ msgid "Add a personal note:"
msgstr ""
#: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59
#: src/Module/Contact.php:910
#: src/Module/Contact.php:912
msgid "Status Messages and Posts"
msgstr ""
@ -1113,11 +1114,11 @@ msgstr ""
msgid "Photo Albums"
msgstr ""
#: mod/photos.php:112 mod/photos.php:1628
#: mod/photos.php:112 mod/photos.php:1632
msgid "Recent Photos"
msgstr ""
#: mod/photos.php:114 mod/photos.php:1097 mod/photos.php:1630
#: mod/photos.php:114 mod/photos.php:1099 mod/photos.php:1634
msgid "Upload New Photos"
msgstr ""
@ -1200,7 +1201,7 @@ msgstr ""
msgid "Upload Photos"
msgstr ""
#: mod/photos.php:961 mod/photos.php:1042
#: mod/photos.php:961 mod/photos.php:1044
msgid "New album name: "
msgstr ""
@ -1216,149 +1217,149 @@ msgstr ""
msgid "Do you really want to delete this photo album and all its photos?"
msgstr ""
#: mod/photos.php:1025 mod/photos.php:1047
#: mod/photos.php:1025 mod/photos.php:1049
msgid "Delete Album"
msgstr ""
#: mod/photos.php:1053
#: mod/photos.php:1055
msgid "Edit Album"
msgstr ""
#: mod/photos.php:1054
#: mod/photos.php:1056
msgid "Drop Album"
msgstr ""
#: mod/photos.php:1059
#: mod/photos.php:1061
msgid "Show Newest First"
msgstr ""
#: mod/photos.php:1061
#: mod/photos.php:1063
msgid "Show Oldest First"
msgstr ""
#: mod/photos.php:1082 mod/photos.php:1613
#: mod/photos.php:1084 mod/photos.php:1617
msgid "View Photo"
msgstr ""
#: mod/photos.php:1119
#: mod/photos.php:1121
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
#: mod/photos.php:1121
#: mod/photos.php:1123
msgid "Photo not available"
msgstr ""
#: mod/photos.php:1131
#: mod/photos.php:1133
msgid "Do you really want to delete this photo?"
msgstr ""
#: mod/photos.php:1132 mod/photos.php:1333
#: mod/photos.php:1134 mod/photos.php:1337
msgid "Delete Photo"
msgstr ""
#: mod/photos.php:1224
#: mod/photos.php:1228
msgid "View photo"
msgstr ""
#: mod/photos.php:1226
#: mod/photos.php:1230
msgid "Edit photo"
msgstr ""
#: mod/photos.php:1227
#: mod/photos.php:1231
msgid "Delete photo"
msgstr ""
#: mod/photos.php:1228
#: mod/photos.php:1232
msgid "Use as profile photo"
msgstr ""
#: mod/photos.php:1235
#: mod/photos.php:1239
msgid "Private Photo"
msgstr ""
#: mod/photos.php:1241
#: mod/photos.php:1245
msgid "View Full Size"
msgstr ""
#: mod/photos.php:1301
#: mod/photos.php:1305
msgid "Tags: "
msgstr ""
#: mod/photos.php:1304
#: mod/photos.php:1308
msgid "[Select tags to remove]"
msgstr ""
#: mod/photos.php:1319
#: mod/photos.php:1323
msgid "New album name"
msgstr ""
#: mod/photos.php:1320
#: mod/photos.php:1324
msgid "Caption"
msgstr ""
#: mod/photos.php:1321
#: mod/photos.php:1325
msgid "Add a Tag"
msgstr ""
#: mod/photos.php:1321
#: mod/photos.php:1325
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
#: mod/photos.php:1322
#: mod/photos.php:1326
msgid "Do not rotate"
msgstr ""
#: mod/photos.php:1323
#: mod/photos.php:1327
msgid "Rotate CW (right)"
msgstr ""
#: mod/photos.php:1324
#: mod/photos.php:1328
msgid "Rotate CCW (left)"
msgstr ""
#: mod/photos.php:1370 mod/photos.php:1426 mod/photos.php:1500
#: src/Module/Contact.php:1062 src/Module/Item/Compose.php:148
#: mod/photos.php:1374 mod/photos.php:1430 mod/photos.php:1504
#: src/Module/Contact.php:1064 src/Module/Item/Compose.php:148
#: src/Object/Post.php:960
msgid "This is you"
msgstr ""
#: mod/photos.php:1372 mod/photos.php:1428 mod/photos.php:1502
#: mod/photos.php:1376 mod/photos.php:1432 mod/photos.php:1506
#: src/Object/Post.php:496 src/Object/Post.php:962
msgid "Comment"
msgstr ""
#: mod/photos.php:1461 src/Content/Conversation.php:615 src/Object/Post.php:227
#: mod/photos.php:1465 src/Content/Conversation.php:615 src/Object/Post.php:227
msgid "Select"
msgstr ""
#: mod/photos.php:1462 mod/settings.php:573 src/Content/Conversation.php:616
#: mod/photos.php:1466 mod/settings.php:573 src/Content/Conversation.php:616
#: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140
#: src/Module/Admin/Users/Index.php:153 src/Module/Contact.php:865
#: src/Module/Contact.php:1150
#: src/Module/Admin/Users/Index.php:153 src/Module/Contact.php:867
#: src/Module/Contact.php:1162
msgid "Delete"
msgstr ""
#: mod/photos.php:1523 src/Object/Post.php:349
#: mod/photos.php:1527 src/Object/Post.php:349
msgid "Like"
msgstr ""
#: mod/photos.php:1524 src/Object/Post.php:349
#: mod/photos.php:1528 src/Object/Post.php:349
msgid "I like this (toggle)"
msgstr ""
#: mod/photos.php:1525 src/Object/Post.php:350
#: mod/photos.php:1529 src/Object/Post.php:350
msgid "Dislike"
msgstr ""
#: mod/photos.php:1527 src/Object/Post.php:350
#: mod/photos.php:1531 src/Object/Post.php:350
msgid "I don't like this (toggle)"
msgstr ""
#: mod/photos.php:1549
#: mod/photos.php:1553
msgid "Map"
msgstr ""
#: mod/photos.php:1619 mod/videos.php:243
#: mod/photos.php:1623 mod/videos.php:243
msgid "View Album"
msgstr ""
@ -2413,16 +2414,16 @@ msgid "All contacts"
msgstr ""
#: src/BaseModule.php:212 src/Content/Widget.php:238 src/Core/ACL.php:195
#: src/Module/Contact.php:831 src/Module/PermissionTooltip.php:77
#: src/Module/Contact.php:833 src/Module/PermissionTooltip.php:77
#: src/Module/PermissionTooltip.php:99
msgid "Followers"
msgstr ""
#: src/BaseModule.php:217 src/Content/Widget.php:239 src/Module/Contact.php:832
#: src/BaseModule.php:217 src/Content/Widget.php:239 src/Module/Contact.php:834
msgid "Following"
msgstr ""
#: src/BaseModule.php:222 src/Content/Widget.php:240 src/Module/Contact.php:833
#: src/BaseModule.php:222 src/Content/Widget.php:240 src/Module/Contact.php:835
msgid "Mutual friends"
msgstr ""
@ -3020,43 +3021,43 @@ msgstr ""
msgid "Follow Thread"
msgstr ""
#: src/Content/Item.php:443 src/Model/Contact.php:1051
#: src/Content/Item.php:443 src/Model/Contact.php:1081
msgid "View Status"
msgstr ""
#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:977
#: src/Model/Contact.php:1043 src/Model/Contact.php:1052
#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:1007
#: src/Model/Contact.php:1073 src/Model/Contact.php:1082
#: src/Module/Directory.php:160 src/Module/Settings/Profile/Index.php:223
msgid "View Profile"
msgstr ""
#: src/Content/Item.php:445 src/Model/Contact.php:1053
#: src/Content/Item.php:445 src/Model/Contact.php:1083
msgid "View Photos"
msgstr ""
#: src/Content/Item.php:446 src/Model/Contact.php:1044
#: src/Model/Contact.php:1054
#: src/Content/Item.php:446 src/Model/Contact.php:1074
#: src/Model/Contact.php:1084
msgid "Network Posts"
msgstr ""
#: src/Content/Item.php:447 src/Model/Contact.php:1045
#: src/Model/Contact.php:1055
#: src/Content/Item.php:447 src/Model/Contact.php:1075
#: src/Model/Contact.php:1085
msgid "View Contact"
msgstr ""
#: src/Content/Item.php:448 src/Model/Contact.php:1057
#: src/Content/Item.php:448 src/Model/Contact.php:1087
msgid "Send PM"
msgstr ""
#: src/Content/Item.php:449 src/Module/Admin/Blocklist/Contact.php:84
#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154
#: src/Module/Contact.php:602 src/Module/Contact.php:863
#: src/Module/Contact.php:1133
#: src/Module/Contact.php:604 src/Module/Contact.php:865
#: src/Module/Contact.php:1135
msgid "Block"
msgstr ""
#: src/Content/Item.php:450 src/Module/Contact.php:603
#: src/Module/Contact.php:864 src/Module/Contact.php:1141
#: src/Content/Item.php:450 src/Module/Contact.php:605
#: src/Module/Contact.php:866 src/Module/Contact.php:1143
#: src/Module/Notifications/Introductions.php:113
#: src/Module/Notifications/Introductions.php:185
#: src/Module/Notifications/Notification.php:59
@ -3067,7 +3068,7 @@ msgstr ""
msgid "Languages"
msgstr ""
#: src/Content/Item.php:458 src/Model/Contact.php:1058
#: src/Content/Item.php:458 src/Model/Contact.php:1088
msgid "Poke"
msgstr ""
@ -3105,7 +3106,7 @@ msgid "Sign in"
msgstr ""
#: src/Content/Nav.php:190 src/Module/BaseProfile.php:56
#: src/Module/Contact.php:634 src/Module/Contact.php:899
#: src/Module/Contact.php:636 src/Module/Contact.php:901
#: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:226
msgid "Status"
msgstr ""
@ -3116,8 +3117,8 @@ msgid "Your posts and conversations"
msgstr ""
#: src/Content/Nav.php:191 src/Module/BaseProfile.php:48
#: src/Module/BaseSettings.php:57 src/Module/Contact.php:636
#: src/Module/Contact.php:915 src/Module/Profile/Profile.php:241
#: src/Module/BaseSettings.php:57 src/Module/Contact.php:638
#: src/Module/Contact.php:917 src/Module/Profile/Profile.php:241
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:227
msgid "Profile"
msgstr ""
@ -3203,8 +3204,8 @@ msgstr ""
#: src/Content/Nav.php:235 src/Content/Nav.php:294
#: src/Content/Text/HTML.php:902 src/Module/BaseProfile.php:126
#: src/Module/BaseProfile.php:129 src/Module/Contact.php:834
#: src/Module/Contact.php:922 view/theme/frio/theme.php:237
#: src/Module/BaseProfile.php:129 src/Module/Contact.php:836
#: src/Module/Contact.php:924 view/theme/frio/theme.php:237
msgid "Contacts"
msgstr ""
@ -3434,7 +3435,7 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
#: src/Content/Widget.php:78 src/Module/Contact.php:855
#: src/Content/Widget.php:78 src/Module/Contact.php:857
#: src/Module/Directory.php:99 view/theme/vier/theme.php:174
msgid "Find"
msgstr ""
@ -3461,7 +3462,7 @@ msgid "Local Directory"
msgstr ""
#: src/Content/Widget.php:214 src/Model/Group.php:535
#: src/Module/Contact.php:818 src/Module/Welcome.php:76
#: src/Module/Contact.php:820 src/Module/Welcome.php:76
msgid "Groups"
msgstr ""
@ -3473,7 +3474,7 @@ msgstr ""
msgid "Relationships"
msgstr ""
#: src/Content/Widget.php:247 src/Module/Contact.php:770
#: src/Content/Widget.php:247 src/Module/Contact.php:772
#: src/Module/Group.php:292
msgid "All Contacts"
msgstr ""
@ -3517,7 +3518,7 @@ msgstr ""
msgid "Organisations"
msgstr ""
#: src/Content/Widget.php:529 src/Model/Contact.php:1474
#: src/Content/Widget.php:529 src/Model/Contact.php:1504
msgid "News"
msgstr ""
@ -3572,12 +3573,12 @@ msgid "More Trending Tags"
msgstr ""
#: src/Content/Widget/VCard.php:96 src/Model/Profile.php:372
#: src/Module/Contact.php:625 src/Module/Profile/Profile.php:176
#: src/Module/Contact.php:627 src/Module/Profile/Profile.php:176
msgid "XMPP:"
msgstr ""
#: src/Content/Widget/VCard.php:97 src/Model/Profile.php:373
#: src/Module/Contact.php:627 src/Module/Profile/Profile.php:180
#: src/Module/Contact.php:629 src/Module/Profile/Profile.php:180
msgid "Matrix:"
msgstr ""
@ -4381,85 +4382,85 @@ msgstr ""
msgid "Legacy module file not found: %s"
msgstr ""
#: src/Model/Contact.php:1047 src/Model/Contact.php:1060
#: src/Model/Contact.php:1077 src/Model/Contact.php:1090
msgid "UnFollow"
msgstr ""
#: src/Model/Contact.php:1056
#: src/Model/Contact.php:1086
msgid "Drop Contact"
msgstr ""
#: src/Model/Contact.php:1066 src/Module/Admin/Users/Pending.php:107
#: src/Model/Contact.php:1096 src/Module/Admin/Users/Pending.php:107
#: src/Module/Notifications/Introductions.php:111
#: src/Module/Notifications/Introductions.php:183
msgid "Approve"
msgstr ""
#: src/Model/Contact.php:1470
#: src/Model/Contact.php:1500
msgid "Organisation"
msgstr ""
#: src/Model/Contact.php:1478
#: src/Model/Contact.php:1508
msgid "Forum"
msgstr ""
#: src/Model/Contact.php:2334
#: src/Model/Contact.php:2364
msgid "Disallowed profile URL."
msgstr ""
#: src/Model/Contact.php:2339 src/Module/Friendica.php:81
#: src/Model/Contact.php:2369 src/Module/Friendica.php:81
msgid "Blocked domain"
msgstr ""
#: src/Model/Contact.php:2344
#: src/Model/Contact.php:2374
msgid "Connect URL missing."
msgstr ""
#: src/Model/Contact.php:2353
#: src/Model/Contact.php:2383
msgid ""
"The contact could not be added. Please check the relevant network "
"credentials in your Settings -> Social Networks page."
msgstr ""
#: src/Model/Contact.php:2390
#: src/Model/Contact.php:2420
msgid "The profile address specified does not provide adequate information."
msgstr ""
#: src/Model/Contact.php:2392
#: src/Model/Contact.php:2422
msgid "No compatible communication protocols or feeds were discovered."
msgstr ""
#: src/Model/Contact.php:2395
#: src/Model/Contact.php:2425
msgid "An author or name was not found."
msgstr ""
#: src/Model/Contact.php:2398
#: src/Model/Contact.php:2428
msgid "No browser URL could be matched to this address."
msgstr ""
#: src/Model/Contact.php:2401
#: src/Model/Contact.php:2431
msgid ""
"Unable to match @-style Identity Address with a known protocol or email "
"contact."
msgstr ""
#: src/Model/Contact.php:2402
#: src/Model/Contact.php:2432
msgid "Use mailto: in front of address to force email check."
msgstr ""
#: src/Model/Contact.php:2408
#: src/Model/Contact.php:2438
msgid ""
"The profile address specified belongs to a network which has been disabled "
"on this site."
msgstr ""
#: src/Model/Contact.php:2413
#: src/Model/Contact.php:2443
msgid ""
"Limited profile. This person will be unable to receive direct/personal "
"notifications from you."
msgstr ""
#: src/Model/Contact.php:2472
#: src/Model/Contact.php:2502
msgid "Unable to retrieve contact information."
msgstr ""
@ -4729,7 +4730,7 @@ msgstr ""
msgid "Homepage:"
msgstr ""
#: src/Model/Profile.php:371 src/Module/Contact.php:629
#: src/Model/Profile.php:371 src/Module/Contact.php:631
#: src/Module/Notifications/Introductions.php:168
msgid "About:"
msgstr ""
@ -5130,8 +5131,8 @@ msgstr ""
msgid "List of active accounts"
msgstr ""
#: src/Module/Admin/BaseUsers.php:66 src/Module/Contact.php:778
#: src/Module/Contact.php:838
#: src/Module/Admin/BaseUsers.php:66 src/Module/Contact.php:780
#: src/Module/Contact.php:840
msgid "Pending"
msgstr ""
@ -5139,8 +5140,8 @@ msgstr ""
msgid "List of pending registrations"
msgstr ""
#: src/Module/Admin/BaseUsers.php:74 src/Module/Contact.php:786
#: src/Module/Contact.php:839
#: src/Module/Admin/BaseUsers.php:74 src/Module/Contact.php:788
#: src/Module/Contact.php:841
msgid "Blocked"
msgstr ""
@ -5197,8 +5198,8 @@ msgstr ""
#: src/Module/Admin/Blocklist/Contact.php:85
#: src/Module/Admin/Users/Blocked.php:142 src/Module/Admin/Users/Index.php:156
#: src/Module/Contact.php:602 src/Module/Contact.php:863
#: src/Module/Contact.php:1133
#: src/Module/Contact.php:604 src/Module/Contact.php:865
#: src/Module/Contact.php:1135
msgid "Unblock"
msgstr ""
@ -6544,7 +6545,7 @@ msgid ""
"received."
msgstr ""
#: src/Module/Admin/Site.php:609 src/Module/Contact.php:531
#: src/Module/Admin/Site.php:609 src/Module/Contact.php:533
#: src/Module/Settings/TwoFactor/Index.php:118
msgid "Disabled"
msgstr ""
@ -7237,7 +7238,7 @@ msgstr ""
msgid "Too Many Requests"
msgstr ""
#: src/Module/BaseProfile.php:51 src/Module/Contact.php:918
#: src/Module/BaseProfile.php:51 src/Module/Contact.php:920
msgid "Profile Details"
msgstr ""
@ -7343,326 +7344,335 @@ msgstr ""
msgid "Contact has been unignored"
msgstr ""
#: src/Module/Contact.php:435
#: src/Module/Contact.php:436
msgid "Drop contact"
msgstr ""
#: src/Module/Contact.php:438 src/Module/Contact.php:859
#: src/Module/Contact.php:437 src/Module/Contact.php:861
msgid "Do you really want to delete this contact?"
msgstr ""
#: src/Module/Contact.php:439 src/Module/Notifications/Introductions.php:123
#: src/Module/Contact.php:438 src/Module/Contact/Revoke.php:98
#: src/Module/Notifications/Introductions.php:123
#: src/Module/OAuth/Acknowledge.php:47 src/Module/Register.php:117
msgid "Yes"
msgstr ""
#: src/Module/Contact.php:452
#: src/Module/Contact.php:454
msgid "Contact has been removed."
msgstr ""
#: src/Module/Contact.php:473
#: src/Module/Contact.php:475
#, php-format
msgid "You are mutual friends with %s"
msgstr ""
#: src/Module/Contact.php:477
#: src/Module/Contact.php:479
#, php-format
msgid "You are sharing with %s"
msgstr ""
#: src/Module/Contact.php:481
#: src/Module/Contact.php:483
#, php-format
msgid "%s is sharing with you"
msgstr ""
#: src/Module/Contact.php:505
#: src/Module/Contact.php:507
msgid "Private communications are not available for this contact."
msgstr ""
#: src/Module/Contact.php:507
#: src/Module/Contact.php:509
msgid "Never"
msgstr ""
#: src/Module/Contact.php:510
#: src/Module/Contact.php:512
msgid "(Update was not successful)"
msgstr ""
#: src/Module/Contact.php:510
#: src/Module/Contact.php:512
msgid "(Update was successful)"
msgstr ""
#: src/Module/Contact.php:512 src/Module/Contact.php:1104
#: src/Module/Contact.php:514 src/Module/Contact.php:1106
msgid "Suggest friends"
msgstr ""
#: src/Module/Contact.php:516
#: src/Module/Contact.php:518
#, php-format
msgid "Network type: %s"
msgstr ""
#: src/Module/Contact.php:521
#: src/Module/Contact.php:523
msgid "Communications lost with this contact!"
msgstr ""
#: src/Module/Contact.php:527
#: src/Module/Contact.php:529
msgid "Fetch further information for feeds"
msgstr ""
#: src/Module/Contact.php:529
#: src/Module/Contact.php:531
msgid ""
"Fetch information like preview pictures, title and teaser from the feed "
"item. You can activate this if the feed doesn't contain much text. Keywords "
"are taken from the meta header in the feed item and are posted as hash tags."
msgstr ""
#: src/Module/Contact.php:532
#: src/Module/Contact.php:534
msgid "Fetch information"
msgstr ""
#: src/Module/Contact.php:533
#: src/Module/Contact.php:535
msgid "Fetch keywords"
msgstr ""
#: src/Module/Contact.php:534
#: src/Module/Contact.php:536
msgid "Fetch information and keywords"
msgstr ""
#: src/Module/Contact.php:546 src/Module/Contact.php:550
#: src/Module/Contact.php:553 src/Module/Contact.php:557
#: src/Module/Contact.php:548 src/Module/Contact.php:552
#: src/Module/Contact.php:555 src/Module/Contact.php:559
msgid "No mirroring"
msgstr ""
#: src/Module/Contact.php:547
#: src/Module/Contact.php:549
msgid "Mirror as forwarded posting"
msgstr ""
#: src/Module/Contact.php:548 src/Module/Contact.php:554
#: src/Module/Contact.php:558
#: src/Module/Contact.php:550 src/Module/Contact.php:556
#: src/Module/Contact.php:560
msgid "Mirror as my own posting"
msgstr ""
#: src/Module/Contact.php:551 src/Module/Contact.php:555
#: src/Module/Contact.php:553 src/Module/Contact.php:557
msgid "Native reshare"
msgstr ""
#: src/Module/Contact.php:570
#: src/Module/Contact.php:572
msgid "Contact Information / Notes"
msgstr ""
#: src/Module/Contact.php:571
#: src/Module/Contact.php:573
msgid "Contact Settings"
msgstr ""
#: src/Module/Contact.php:579
#: src/Module/Contact.php:581
msgid "Contact"
msgstr ""
#: src/Module/Contact.php:583
#: src/Module/Contact.php:585
msgid "Their personal note"
msgstr ""
#: src/Module/Contact.php:585
#: src/Module/Contact.php:587
msgid "Edit contact notes"
msgstr ""
#: src/Module/Contact.php:588 src/Module/Contact.php:1070
#: src/Module/Contact.php:590 src/Module/Contact.php:1072
#, php-format
msgid "Visit %s's profile [%s]"
msgstr ""
#: src/Module/Contact.php:589
#: src/Module/Contact.php:591
msgid "Block/Unblock contact"
msgstr ""
#: src/Module/Contact.php:590
#: src/Module/Contact.php:592
msgid "Ignore contact"
msgstr ""
#: src/Module/Contact.php:591
#: src/Module/Contact.php:593
msgid "View conversations"
msgstr ""
#: src/Module/Contact.php:596
#: src/Module/Contact.php:598
msgid "Last update:"
msgstr ""
#: src/Module/Contact.php:598
#: src/Module/Contact.php:600
msgid "Update public posts"
msgstr ""
#: src/Module/Contact.php:600 src/Module/Contact.php:1114
#: src/Module/Contact.php:602 src/Module/Contact.php:1116
msgid "Update now"
msgstr ""
#: src/Module/Contact.php:603 src/Module/Contact.php:864
#: src/Module/Contact.php:1141
#: src/Module/Contact.php:605 src/Module/Contact.php:866
#: src/Module/Contact.php:1143
msgid "Unignore"
msgstr ""
#: src/Module/Contact.php:607
#: src/Module/Contact.php:609
msgid "Currently blocked"
msgstr ""
#: src/Module/Contact.php:608
#: src/Module/Contact.php:610
msgid "Currently ignored"
msgstr ""
#: src/Module/Contact.php:609
#: src/Module/Contact.php:611
msgid "Currently archived"
msgstr ""
#: src/Module/Contact.php:610
#: src/Module/Contact.php:612
msgid "Awaiting connection acknowledge"
msgstr ""
#: src/Module/Contact.php:611 src/Module/Notifications/Introductions.php:171
#: src/Module/Contact.php:613 src/Module/Notifications/Introductions.php:171
msgid "Hide this contact from others"
msgstr ""
#: src/Module/Contact.php:611
#: src/Module/Contact.php:613
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
#: src/Module/Contact.php:612
#: src/Module/Contact.php:614
msgid "Notification for new posts"
msgstr ""
#: src/Module/Contact.php:612
#: src/Module/Contact.php:614
msgid "Send a notification of every new post of this contact"
msgstr ""
#: src/Module/Contact.php:614
#: src/Module/Contact.php:616
msgid "Keyword Deny List"
msgstr ""
#: src/Module/Contact.php:614
#: src/Module/Contact.php:616
msgid ""
"Comma separated list of keywords that should not be converted to hashtags, "
"when \"Fetch information and keywords\" is selected"
msgstr ""
#: src/Module/Contact.php:632 src/Module/Settings/TwoFactor/Index.php:132
#: src/Module/Contact.php:634 src/Module/Settings/TwoFactor/Index.php:132
msgid "Actions"
msgstr ""
#: src/Module/Contact.php:639
#: src/Module/Contact.php:641
msgid "Mirror postings from this contact"
msgstr ""
#: src/Module/Contact.php:641
#: src/Module/Contact.php:643
msgid ""
"Mark this contact as remote_self, this will cause friendica to repost new "
"entries from this contact."
msgstr ""
#: src/Module/Contact.php:773
#: src/Module/Contact.php:775
msgid "Show all contacts"
msgstr ""
#: src/Module/Contact.php:781
#: src/Module/Contact.php:783
msgid "Only show pending contacts"
msgstr ""
#: src/Module/Contact.php:789
#: src/Module/Contact.php:791
msgid "Only show blocked contacts"
msgstr ""
#: src/Module/Contact.php:794 src/Module/Contact.php:841
#: src/Module/Contact.php:796 src/Module/Contact.php:843
#: src/Object/Post.php:309
msgid "Ignored"
msgstr ""
#: src/Module/Contact.php:797
#: src/Module/Contact.php:799
msgid "Only show ignored contacts"
msgstr ""
#: src/Module/Contact.php:802 src/Module/Contact.php:842
#: src/Module/Contact.php:804 src/Module/Contact.php:844
msgid "Archived"
msgstr ""
#: src/Module/Contact.php:805
#: src/Module/Contact.php:807
msgid "Only show archived contacts"
msgstr ""
#: src/Module/Contact.php:810 src/Module/Contact.php:840
#: src/Module/Contact.php:812 src/Module/Contact.php:842
msgid "Hidden"
msgstr ""
#: src/Module/Contact.php:813
#: src/Module/Contact.php:815
msgid "Only show hidden contacts"
msgstr ""
#: src/Module/Contact.php:821
#: src/Module/Contact.php:823
msgid "Organize your contact groups"
msgstr ""
#: src/Module/Contact.php:853
#: src/Module/Contact.php:855
msgid "Search your contacts"
msgstr ""
#: src/Module/Contact.php:854 src/Module/Search/Index.php:194
#: src/Module/Contact.php:856 src/Module/Search/Index.php:194
#, php-format
msgid "Results for: %s"
msgstr ""
#: src/Module/Contact.php:862
#: src/Module/Contact.php:864
msgid "Update"
msgstr ""
#: src/Module/Contact.php:867
#: src/Module/Contact.php:869
msgid "Batch Actions"
msgstr ""
#: src/Module/Contact.php:902
#: src/Module/Contact.php:904
msgid "Conversations started by this contact"
msgstr ""
#: src/Module/Contact.php:907
#: src/Module/Contact.php:909
msgid "Posts and Comments"
msgstr ""
#: src/Module/Contact.php:925
#: src/Module/Contact.php:927
msgid "View all known contacts"
msgstr ""
#: src/Module/Contact.php:935
#: src/Module/Contact.php:937
msgid "Advanced Contact Settings"
msgstr ""
#: src/Module/Contact.php:1029
#: src/Module/Contact.php:1031
msgid "Mutual Friendship"
msgstr ""
#: src/Module/Contact.php:1033
#: src/Module/Contact.php:1035
msgid "is a fan of yours"
msgstr ""
#: src/Module/Contact.php:1037
#: src/Module/Contact.php:1039
msgid "you are a fan of"
msgstr ""
#: src/Module/Contact.php:1055
#: src/Module/Contact.php:1057
msgid "Pending outgoing contact request"
msgstr ""
#: src/Module/Contact.php:1057
#: src/Module/Contact.php:1059
msgid "Pending incoming contact request"
msgstr ""
#: src/Module/Contact.php:1124
#: src/Module/Contact.php:1126
msgid "Refetch contact data"
msgstr ""
#: src/Module/Contact.php:1135
#: src/Module/Contact.php:1137
msgid "Toggle Blocked status"
msgstr ""
#: src/Module/Contact.php:1143
#: src/Module/Contact.php:1145
msgid "Toggle Ignored status"
msgstr ""
#: src/Module/Contact.php:1152
#: src/Module/Contact.php:1153 src/Module/Contact/Revoke.php:96
msgid "Revoke Follow"
msgstr ""
#: src/Module/Contact.php:1155
msgid "Revoke the follow from this contact"
msgstr ""
#: src/Module/Contact.php:1164
msgid "Delete contact"
msgstr ""
@ -7805,6 +7815,39 @@ msgstr ""
msgid "Make this post private"
msgstr ""
#: src/Module/Contact/Revoke.php:48
msgid "Unknown contact."
msgstr ""
#: src/Module/Contact/Revoke.php:58 src/Module/Group.php:109
msgid "Contact is deleted."
msgstr ""
#: src/Module/Contact/Revoke.php:62
msgid "Contact is being deleted."
msgstr ""
#: src/Module/Contact/Revoke.php:76
msgid "Follow was successfully revoked."
msgstr ""
#: src/Module/Contact/Revoke.php:78
msgid ""
"Follow was successfully revoked, however the remote contact won't be aware "
"of this revokation."
msgstr ""
#: src/Module/Contact/Revoke.php:80
msgid ""
"Unable to revoke follow, please try again later or contact the administrator."
msgstr ""
#: src/Module/Contact/Revoke.php:97
msgid ""
"Do you really want to revoke this contact's follow? This cannot be undone "
"and they will have to manually follow you back again."
msgstr ""
#: src/Module/Conversation/Community.php:68
msgid "Local Community"
msgstr ""
@ -8285,10 +8328,6 @@ msgstr ""
msgid "Unknown group."
msgstr ""
#: src/Module/Group.php:109
msgid "Contact is deleted."
msgstr ""
#: src/Module/Group.php:115
msgid "Unable to add the contact to the group."
msgstr ""
@ -10446,7 +10485,7 @@ msgstr ""
msgid "Show fewer"
msgstr ""
#: src/Protocol/Diaspora.php:3448
#: src/Protocol/Diaspora.php:3417
msgid "Attachments:"
msgstr ""

View file

@ -2,10 +2,10 @@
<center>
<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
<h3 id="confirm-message">{{$message}}</h3>
<h3 id="confirm-message">{{$l10n.message}}</h3>
<button class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm_value}}">{{$confirm}}</button>
<button class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}">{{$cancel}}</button>
<button class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm_value}}">{{$l10n.confirm}}</button>
<button class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$l10n.cancel}}">{{$l10n.cancel}}</button>
</form>
</center>

View file

@ -1,8 +1,8 @@
<h1>{{$header}}</h1>
{{include file="contact_template.tpl" no_contacts_checkbox=True}}
{{include file="confirm.tpl"}}
<h1>{{$l10n.header}}</h1>
{{include file="contact_template.tpl" no_contacts_checkbox=True}}
{{include file="confirm.tpl"}}
<div class="clear"></div>

View file

@ -15,13 +15,14 @@
<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
{{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
{{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
{{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
{{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
<li class="divider"></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
{{if $contact_actions.delete.url}}<li role="menuitem"><a href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> {{/if}}
<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
{{if $contact_actions.revoke_follow.url}}<li role="menuitem"><a href="{{$contact_actions.revoke_follow.url}}" title="{{$contact_actions.revoke_follow.title}}">{{$contact_actions.revoke_follow.label}}</a></li>{{/if}}
{{if $contact_actions.delete.url}}<li role="menuitem"><a href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> {{/if}}
</ul>
</div>

View file

@ -1,9 +1,9 @@
<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}" class="generic-page-wrapper">
<div id="confirm-message">{{$message}}</div>
<div id="confirm-message">{{$l10n.message}}</div>
<div class="form-group pull-right settings-submit-wrapper">
<button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm_value}}">{{$confirm}}</button>
<button type="submit" name="canceled" value="{{$cancel}} id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
<button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm_value}}">{{$l10n.confirm}}</button>
<button type="submit" name="canceled" value="{{$l10n.cancel}}" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$l10n.cancel}}</button>
</div>
</form>

View file

@ -1,9 +1,9 @@
<div id="contact-drop-confirm">
<h2 class="heading">{{$header}}</h2>
{{include file="contact_template.tpl" no_contacts_checkbox=True}}
{{include file="confirm.tpl"}}
<div class="clear"></div>
</div>
<div id="contact-drop-confirm">
<h2 class="heading">{{$l10n.header}}</h2>
{{include file="contact_template.tpl" no_contacts_checkbox=True}}
{{include file="confirm.tpl"}}
<div class="clear"></div>
</div>

View file

@ -27,6 +27,7 @@
{{/if}}
<li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
<li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
{{if $contact_actions.revoke_follow.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.revoke_follow.title}}" onclick="addToModal('{{$contact_actions.revoke_follow.url}}');">{{$contact_actions.revoke_follow.label}}</button></li>{{/if}}
{{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}&confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
</ul>
</li>

View file

@ -16,13 +16,14 @@
<a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a>
<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
{{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
{{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
{{if $lblsuggest}}<li role="menuitem"><a href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
{{if $poll_enabled}}<li role="menuitem"><a href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
<li class="divider"></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
{{if $contact_actions.delete.url}}<li role="menuitem"><a href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>{{/if}}
<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
{{if $contact_actions.revoke_follow.url}}<li role="menuitem"><a href="{{$contact_actions.revoke_follow.url}}" title="{{$contact_actions.revoke_follow.title}}">{{$contact_actions.revoke_follow.label}}</a></li>{{/if}}
{{if $contact_actions.delete.url}}<li role="menuitem"><a href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>{{/if}}
</ul>
</div>