nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into oauth-login

Browse source
This commit is contained in:
Michael 2021-05-11 06:29:17 +00:00
commit b014f349ae
28 changed files with 7811 additions and 7958 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.drone.yml Normal file
View file

@ -0,0 +1,14 @@
kind: pipeline
type: docker
name: Check messages.po
steps:
- name: Run default Xgettext
image: friendicaci/transifex
commands:
- ./bin/run_xgettext.sh
- name: Check default
image: friendicaci/transifex
commands:
- /check-messages.sh

31
.github/workflows/transifex.yml vendored
View file

@ -1,31 +0,0 @@
name: Transifex
on: [push, pull_request]
jobs:
messages:
name: Check messages.po changes
runs-on: ubuntu-latest
steps:
- name: Install gettext
run: sudo apt-get install gettext
- name: Checkout
uses: actions/checkout@v2
- name: Run Xgettext
run: ./bin/run_xgettext.sh
- name: Check if messages.po needs an update
run: |
echo "::group::Check messages.po"
# Skip first 4 lines in possible diff, because they're header
# Skip all lines of the git diff starting with "@@" or comments or starting "POT-Creation-Date"
if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) -gt 4 ]]; then
echo "::error file=messages.po::messages.po is out of date"
echo "$(git diff ./view/lang/C/messages.po)"
exit 1
else
echo "Nothing to update"
fi
echo "::endgroup::"
shell: bash

1
include/conversation.php
View file

@ -1212,6 +1212,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$edimg' => DI::l10n()->t('Image'), '$edimg' => DI::l10n()->t('Image'),
'$edurl' => DI::l10n()->t('Link'), '$edurl' => DI::l10n()->t('Link'),
'$edattach' => DI::l10n()->t('Link or Media'), '$edattach' => DI::l10n()->t('Link or Media'),
'$edvideo' => DI::l10n()->t('Video'),
'$setloc' => DI::l10n()->t('Set your location'), '$setloc' => DI::l10n()->t('Set your location'),
'$shortsetloc' => DI::l10n()->t('set location'), '$shortsetloc' => DI::l10n()->t('set location'),
'$noloc' => DI::l10n()->t('Clear browser location'), '$noloc' => DI::l10n()->t('Clear browser location'),

2
mod/ping.php
View file

@ -139,7 +139,7 @@ function ping_init(App $a)
local_user(), Verb::getID(Activity::FOLLOW)]; local_user(), Verb::getID(Activity::FOLLOW)];
$items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition); $items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
if (DBA::isResult($items)) { if (DBA::isResult($items)) {
$items_unseen = Post::toArray($items); $items_unseen = Post::toArray($items, false);
$arr = ['items' => $items_unseen]; $arr = ['items' => $items_unseen];
Hook::callAll('network_ping', $arr); Hook::callAll('network_ping', $arr);

495
mods/.drone.yml
View file

@ -1,495 +0,0 @@
# Drone.io test YML-File, currently disabled
# See https://github.com/friendica/friendica/pull/7643 for further infos
kind: pipeline
name: mysql8.0-php7.1
steps:
- name: mysql8.0-php7.1
image: friendicaci/php7.1:php7.1.32
commands:
- NOCOVERAGE=true ./autotest.sh mysql
environment:
MYSQL_USERNAME: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mysql
node:
test: db
services:
- name: mysql
image: mysql:8.0
command: [ "--default-authentication-plugin=mysql_native_password" ]
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: mysql8.0-php7.2
steps:
- name: mysql8.0-php7.2
image: friendicaci/php7.2:php7.2.22
commands:
- NOCOVERAGE=true ./autotest.sh mysql
environment:
MYSQL_USERNAME: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mysql
node:
test: db
services:
- name: mysql
image: mysql:8.0
command: [ "--default-authentication-plugin=mysql_native_password" ]
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: mysql8.0-php7.3
steps:
- name: mysql8.0-php7.3
image: friendicaci/php7.3:php7.3.9
commands:
- NOCOVERAGE=true ./autotest.sh mysql
environment:
MYSQL_USERNAME: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mysql
node:
test: db
services:
- name: mysql
image: mysql:8.0
command: [ "--default-authentication-plugin=mysql_native_password" ]
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: mariadb10.1-php7.1
steps:
- name: mariadb10.1-php7.1
image: friendicaci/php7.1:php7.1.32
commands:
- phpenmod xdebug
- sleep 20
- ./autotest.sh mariadb
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
environment:
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mariadb
node:
test: db
services:
- name: mariadb
image: mariadb:10.1
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: mariadb10.1-php7.2
steps:
- name: mariadb10.1-php7.2
image: friendicaci/php7.2:php7.2.22
commands:
- NOCOVERAGE=true ./autotest.sh mariadb
environment:
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mariadb
node:
test: db
services:
- name: mariadb
image: mariadb:10.1
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: mariadb10.1-php7.3
steps:
- name: mariadb10.1-php7.3
image: friendicaci/php7.3:php7.3.9
commands:
- NOCOVERAGE=true ./autotest.sh mariadb
environment:
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
MYSQL_HOST: mariadb
node:
test: db
services:
- name: mariadb
image: mariadb:10.1
environment:
MYSQL_ROOT_PASSWORD: friendica
MYSQL_USER: friendica
MYSQL_PASSWORD: friendica
MYSQL_DATABASE: friendica
volumes:
- name: cache
path: /var/lib/mysql
volumes:
- name: cache
temp: {}
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: redis-php7.1
steps:
- name: redis-php7.1
image: friendicaci/php7.1:php7.1.32
commands:
- phpenmod xdebug
- sleep 20
- NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
environment:
REDIS_HOST: redis
services:
- name: redis
image: redis
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: redis-php7.2
steps:
- name: redis-php7.2
image: friendicaci/php7.2:php7.2.22
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
environment:
REDIS_HOST: redis
services:
- name: redis
image: redis
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: redis-php7.3
steps:
- name: redis-php7.3
image: friendicaci/php7.3:php7.3.9
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
environment:
REDIS_HOST: redis
services:
- name: redis
image: redis
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcache-php7.1
steps:
- name: memcache-php7.1
image: friendicaci/php7.1:php7.1.32
commands:
- phpenmod xdebug
- sleep 20
- NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
environment:
MEMCACHE_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcache-php7.2
steps:
- name: memcache-php7.2
image: friendicaci/php7.2:php7.2.22
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
environment:
MEMCACHE_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcache-php7.3
steps:
- name: memcache-php7.3
image: friendicaci/php7.3:php7.3.9
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
environment:
MEMCACHE_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcached-php7.1
steps:
- name: memcached-php7.1
image: friendicaci/php7.1:php7.1.32
commands:
- phpenmod xdebug
- sleep 20
- NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 5ce7d64e-07b4-4adf-8700-e2eae27e14ec -f tests/autotest-clover.xml; fi"
environment:
MEMCACHED_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcached-php7.2
steps:
- name: memcached-php7.2
image: friendicaci/php7.2:php7.2.22
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
environment:
MEMCACHED_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push
---
kind: pipeline
name: memcached-php7.3
steps:
- name: memcached-php7.3
image: friendicaci/php7.3:php7.3.9
commands:
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
environment:
MEMCACHED_HOST: memcached
services:
- name: memcached
image: memcached
trigger:
branch:
# - stable
- develop
# - "*-rc"
# event:
# - pull_request
# - push

38
src/Content/Nav.php
View file

@ -144,9 +144,9 @@ class Nav
* array 'userinfo' => Array of user information (name, icon) * array 'userinfo' => Array of user information (name, icon)
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function getInfo(App $a) private static function getInfo(App $a): array
{ {
$ssl_state = ((local_user()) ? true : false); $ssl_state = (bool) local_user();
/* /*
* Our network is distributed, and as you visit friends some of the * Our network is distributed, and as you visit friends some of the
@ -158,13 +158,27 @@ class Nav
$sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2); $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2);
// nav links: array of array('href', 'text', 'extra css classes', 'title') $nav = [
$nav = []; 'admin' => null,
'apps' => null,
'community' => null,
'home' => null,
'events' => null,
'login' => null,
'logout' => null,
'langselector' => null,
'messages' => null,
'network' => null,
'notifications' => null,
'remote' => null,
'search' => null,
'usermenu' => [],
];
// Display login or logout // Display login or logout
$nav['usermenu'] = [];
$userinfo = null; $userinfo = null;
// nav links: array of array('href', 'text', 'extra css classes', 'title')
if (Session::isAuthenticated()) { if (Session::isAuthenticated()) {
$nav['logout'] = ['logout', DI::l10n()->t('Logout'), '', DI::l10n()->t('End this session')]; $nav['logout'] = ['logout', DI::l10n()->t('Logout'), '', DI::l10n()->t('End this session')];
} else { } else {
@ -297,13 +311,15 @@ class Nav
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>'; $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
} }
Hook::callAll('nav_info', $nav); $nav_info = [
'banner' => $banner,
return [ 'nav' => $nav,
'sitelocation' => $sitelocation, 'sitelocation' => $sitelocation,
'nav' => $nav, 'userinfo' => $userinfo,
'banner' => $banner,
'userinfo' => $userinfo,
]; ];
Hook::callAll('nav_info', $nav_info);
return $nav_info;
} }
} }

2
src/Model/APContact.php
View file

@ -235,7 +235,7 @@ class APContact
unset($parts['path']); unset($parts['path']);
if (empty($apcontact['addr'])) { if (empty($apcontact['addr'])) {
if (!empty($apcontact['nick'])) { if (!empty($apcontact['nick']) && is_array($parts)) {
$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts)); $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
} else { } else {
$apcontact['addr'] = ''; $apcontact['addr'] = '';

3
src/Model/Item.php
View file

@ -3020,7 +3020,7 @@ class Item
]; ];
if (!empty($item['plink'])) { if (!empty($item['plink'])) {
$ret["href"] = DI::baseUrl()->remove($item['plink']); $ret['href'] = DI::baseUrl()->remove($item['plink']);
$ret["title"] = DI::l10n()->t('link to source'); $ret["title"] = DI::l10n()->t('link to source');
} }
} elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) { } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
@ -3028,6 +3028,7 @@ class Item
'href' => $item['plink'], 'href' => $item['plink'],
'orig' => $item['plink'], 'orig' => $item['plink'],
'title' => DI::l10n()->t('link to source'), 'title' => DI::l10n()->t('link to source'),
'orig_title' => DI::l10n()->t('Link to source'),
]; ];
} else { } else {
$ret = []; $ret = [];

7
src/Model/Profile.php
View file

@ -412,7 +412,12 @@ class Profile
} }
} }
$p = []; // Expected profile/vcard.tpl profile.* template variables
$p = [
'address' => null,
'edit' => null,
'upubkey' => null,
];
foreach ($profile as $k => $v) { foreach ($profile as $k => $v) {
$k = str_replace('-', '_', $k); $k = str_replace('-', '_', $k);
$p[$k] = $v; $p[$k] = $v;

18
src/Object/Post.php
View file

@ -427,6 +427,8 @@ class Post
$tmp_item = [ $tmp_item = [
'template' => $this->getTemplate(), 'template' => $this->getTemplate(),
'type' => implode("", array_slice(explode("/", $item['verb']), -1)), 'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
'comment_firstcollapsed' => false,
'comment_lastcollapsed' => false,
'suppress_tags' => DI::config()->get('system', 'suppress_tags'), 'suppress_tags' => DI::config()->get('system', 'suppress_tags'),
'tags' => $tags['tags'], 'tags' => $tags['tags'],
'hashtags' => $tags['hashtags'], 'hashtags' => $tags['hashtags'],
@ -543,10 +545,7 @@ class Post
} }
} }
if ($this->isToplevel()) { $result['total_comments_num'] = $this->isToplevel() ? $total_children : 0;
$result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = DI::l10n()->tt('comment', 'comments', $total_children);
}
$result['private'] = $item['private']; $result['private'] = $item['private'];
$result['toplevel'] = ($this->isToplevel() ? 'toplevel_item' : ''); $result['toplevel'] = ($this->isToplevel() ? 'toplevel_item' : '');
@ -887,8 +886,13 @@ class Post
$terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]); $terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
foreach ($terms as $term) { foreach ($terms as $term) {
if (!$term['url']) {
DI::logger()->warning('Mention term with no URL', ['term' => $term]);
continue;
}
$profile = Contact::getByURL($term['url'], false, ['addr', 'contact-type']); $profile = Contact::getByURL($term['url'], false, ['addr', 'contact-type']);
if (!empty($profile['addr']) && ((($profile['contact-type'] ?? '') ?: Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) && if (!empty($profile['addr']) && (($profile['contact-type'] ?? Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) { ($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
$text .= '@' . $profile['addr'] . ' '; $text .= '@' . $profile['addr'] . ' ';
} }
@ -945,9 +949,9 @@ class Post
'$qcomment' => $qcomment, '$qcomment' => $qcomment,
'$default' => $default_text, '$default' => $default_text,
'$profile_uid' => $uid, '$profile_uid' => $uid,
'$mylink' => DI::baseUrl()->remove($a->contact['url']), '$mylink' => DI::baseUrl()->remove($a->contact['url'] ?? ''),
'$mytitle' => DI::l10n()->t('This is you'), '$mytitle' => DI::l10n()->t('This is you'),
'$myphoto' => DI::baseUrl()->remove($a->contact['thumb']), '$myphoto' => DI::baseUrl()->remove($a->contact['thumb'] ?? ''),
'$comment' => DI::l10n()->t('Comment'), '$comment' => DI::l10n()->t('Comment'),
'$submit' => DI::l10n()->t('Submit'), '$submit' => DI::l10n()->t('Submit'),
'$loading' => DI::l10n()->t('Loading...'), '$loading' => DI::l10n()->t('Loading...'),

2
src/Util/ParseUrl.php
View file

@ -695,7 +695,7 @@ class ParseUrl
{ {
if (!empty($jsonld['@graph']) && is_array($jsonld['@graph'])) { if (!empty($jsonld['@graph']) && is_array($jsonld['@graph'])) {
foreach ($jsonld['@graph'] as $part) { foreach ($jsonld['@graph'] as $part) {
if (!empty($part)) { if (!empty($part) && is_array($part)) {
$siteinfo = self::parseParts($siteinfo, $part); $siteinfo = self::parseParts($siteinfo, $part);
} }
} }

288
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.06-dev\n" "Project-Id-Version: 2021.06-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-08 12:25+0000\n" "POT-Creation-Date: 2021-05-10 19:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -82,20 +82,20 @@ msgstr ""
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: include/conversation.php:600 src/Object/Post.php:447 src/Object/Post.php:448 #: include/conversation.php:600 src/Object/Post.php:449 src/Object/Post.php:450
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: include/conversation.php:613 src/Object/Post.php:435 #: include/conversation.php:613 src/Object/Post.php:437
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: include/conversation.php:614 src/Object/Post.php:436 #: include/conversation.php:614 src/Object/Post.php:438
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: include/conversation.php:621 src/Object/Post.php:461 #: include/conversation.php:621 src/Object/Post.php:463
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
@ -104,10 +104,10 @@ msgstr ""
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: include/conversation.php:638 include/conversation.php:1223 #: include/conversation.php:638 include/conversation.php:1224
#: mod/editpost.php:104 mod/message.php:204 mod/message.php:374 #: mod/editpost.php:104 mod/message.php:204 mod/message.php:374
#: mod/photos.php:1536 mod/wallmessage.php:155 src/Module/Item/Compose.php:159 #: mod/photos.php:1536 mod/wallmessage.php:155 src/Module/Item/Compose.php:159
#: src/Object/Post.php:495 #: src/Object/Post.php:497
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -180,7 +180,7 @@ msgstr ""
msgid "Fetched because of %s" msgid "Fetched because of %s"
msgstr "" msgstr ""
#: include/conversation.php:949 view/theme/frio/theme.php:322 #: include/conversation.php:949 view/theme/frio/theme.php:323
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
@ -336,7 +336,7 @@ msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: include/conversation.php:1184 src/Module/Item/Compose.php:153 #: include/conversation.php:1184 src/Module/Item/Compose.php:153
#: src/Object/Post.php:962 #: src/Object/Post.php:961
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
@ -365,7 +365,7 @@ msgid "Share"
msgstr "" msgstr ""
#: include/conversation.php:1202 mod/editpost.php:89 mod/photos.php:1382 #: include/conversation.php:1202 mod/editpost.php:89 mod/photos.php:1382
#: src/Module/Contact/Poke.php:154 src/Object/Post.php:953 #: src/Module/Contact/Poke.php:154 src/Object/Post.php:952
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
@ -387,92 +387,96 @@ msgid "attach file"
msgstr "" msgstr ""
#: include/conversation.php:1207 src/Module/Item/Compose.php:145 #: include/conversation.php:1207 src/Module/Item/Compose.php:145
#: src/Object/Post.php:954 #: src/Object/Post.php:953
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: include/conversation.php:1208 src/Module/Item/Compose.php:146 #: include/conversation.php:1208 src/Module/Item/Compose.php:146
#: src/Object/Post.php:955 #: src/Object/Post.php:954
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: include/conversation.php:1209 src/Module/Item/Compose.php:147 #: include/conversation.php:1209 src/Module/Item/Compose.php:147
#: src/Object/Post.php:956 #: src/Object/Post.php:955
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: include/conversation.php:1210 src/Module/Item/Compose.php:148 #: include/conversation.php:1210 src/Module/Item/Compose.php:148
#: src/Object/Post.php:957 #: src/Object/Post.php:956
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: include/conversation.php:1211 src/Module/Item/Compose.php:149 #: include/conversation.php:1211 src/Module/Item/Compose.php:149
#: src/Object/Post.php:958 #: src/Object/Post.php:957
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: include/conversation.php:1212 src/Module/Item/Compose.php:150 #: include/conversation.php:1212 src/Module/Item/Compose.php:150
#: src/Object/Post.php:959 #: src/Object/Post.php:958
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: include/conversation.php:1213 src/Module/Item/Compose.php:151 #: include/conversation.php:1213 src/Module/Item/Compose.php:151
#: src/Object/Post.php:960 #: src/Object/Post.php:959
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: include/conversation.php:1214 src/Module/Item/Compose.php:152 #: include/conversation.php:1214 src/Module/Item/Compose.php:152
#: src/Object/Post.php:961 #: src/Object/Post.php:960
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
#: include/conversation.php:1215 mod/editpost.php:100 #: include/conversation.php:1215
msgid "Video"
msgstr ""
#: include/conversation.php:1216 mod/editpost.php:100
#: src/Module/Item/Compose.php:155 #: src/Module/Item/Compose.php:155
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: include/conversation.php:1216 mod/editpost.php:101 #: include/conversation.php:1217 mod/editpost.php:101
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: include/conversation.php:1217 mod/editpost.php:102 #: include/conversation.php:1218 mod/editpost.php:102
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: include/conversation.php:1218 mod/editpost.php:103 #: include/conversation.php:1219 mod/editpost.php:103
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: include/conversation.php:1220 mod/editpost.php:117 #: include/conversation.php:1221 mod/editpost.php:117
#: src/Module/Item/Compose.php:160 #: src/Module/Item/Compose.php:160
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: include/conversation.php:1222 mod/editpost.php:119 #: include/conversation.php:1223 mod/editpost.php:119
#: src/Module/Item/Compose.php:161 #: src/Module/Item/Compose.php:161
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: include/conversation.php:1224 mod/editpost.php:105 #: include/conversation.php:1225 mod/editpost.php:105
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: include/conversation.php:1225 mod/editpost.php:134 mod/events.php:578 #: include/conversation.php:1226 mod/editpost.php:134 mod/events.php:578
#: mod/photos.php:969 mod/photos.php:1335 #: mod/photos.php:969 mod/photos.php:1335
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: include/conversation.php:1234 mod/editpost.php:114 #: include/conversation.php:1235 mod/editpost.php:114
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: include/conversation.php:1238 mod/editpost.php:125 mod/events.php:573 #: include/conversation.php:1239 mod/editpost.php:125 mod/events.php:573
#: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1513 #: mod/photos.php:1381 mod/photos.php:1438 mod/photos.php:1513
#: src/Module/Item/Compose.php:154 src/Object/Post.php:963 #: src/Module/Item/Compose.php:154 src/Object/Post.php:962
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: include/conversation.php:1242 mod/dfrn_request.php:642 mod/editpost.php:128 #: include/conversation.php:1243 mod/dfrn_request.php:642 mod/editpost.php:128
#: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152 #: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/follow.php:152
#: mod/photos.php:1037 mod/photos.php:1143 mod/settings.php:509 #: mod/photos.php:1037 mod/photos.php:1143 mod/settings.php:509
#: mod/settings.php:535 mod/tagrm.php:37 mod/tagrm.php:127 mod/unfollow.php:100 #: mod/settings.php:535 mod/tagrm.php:37 mod/tagrm.php:127 mod/unfollow.php:100
@ -480,17 +484,17 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: include/conversation.php:1249 mod/editpost.php:132 src/Model/Profile.php:445 #: include/conversation.php:1250 mod/editpost.php:132 src/Model/Profile.php:450
#: src/Module/Contact.php:344 #: src/Module/Contact.php:344
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: include/conversation.php:1250 mod/editpost.php:133 #: include/conversation.php:1251 mod/editpost.php:133
#: src/Module/Settings/TwoFactor/Trusted.php:101 #: src/Module/Settings/TwoFactor/Trusted.php:101
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
#: include/conversation.php:1252 mod/editpost.php:136 #: include/conversation.php:1253 mod/editpost.php:136
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
@ -904,10 +908,10 @@ msgstr ""
msgid "Access to this profile has been restricted." msgid "Access to this profile has been restricted."
msgstr "" msgstr ""
#: mod/cal.php:274 mod/events.php:417 src/Content/Nav.php:181 #: mod/cal.php:274 mod/events.php:417 src/Content/Nav.php:195
#: src/Content/Nav.php:248 src/Module/BaseProfile.php:88 #: src/Content/Nav.php:262 src/Module/BaseProfile.php:88
#: src/Module/BaseProfile.php:99 view/theme/frio/theme.php:229 #: src/Module/BaseProfile.php:99 view/theme/frio/theme.php:230
#: view/theme/frio/theme.php:233 #: view/theme/frio/theme.php:234
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -1353,7 +1357,7 @@ msgstr ""
#: src/Module/Install.php:245 src/Module/Install.php:287 #: src/Module/Install.php:245 src/Module/Install.php:287
#: src/Module/Install.php:324 src/Module/Invite.php:174 #: src/Module/Install.php:324 src/Module/Invite.php:174
#: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:243 #: src/Module/Item/Compose.php:144 src/Module/Profile/Profile.php:243
#: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:952 #: src/Module/Settings/Profile/Index.php:237 src/Object/Post.php:951
#: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
#: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
msgid "Submit" msgid "Submit"
@ -1372,8 +1376,8 @@ msgstr ""
msgid "Failed to remove event" msgid "Failed to remove event"
msgstr "" msgstr ""
#: mod/fbrowser.php:43 src/Content/Nav.php:179 src/Module/BaseProfile.php:68 #: mod/fbrowser.php:43 src/Content/Nav.php:193 src/Module/BaseProfile.php:68
#: view/theme/frio/theme.php:227 #: view/theme/frio/theme.php:228
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -1612,7 +1616,7 @@ msgstr ""
msgid "Profile Match" msgid "Profile Match"
msgstr "" msgstr ""
#: mod/message.php:46 mod/message.php:127 src/Content/Nav.php:276 #: mod/message.php:46 mod/message.php:127 src/Content/Nav.php:290
msgid "New Message" msgid "New Message"
msgstr "" msgstr ""
@ -1638,7 +1642,7 @@ msgstr ""
msgid "Discard" msgid "Discard"
msgstr "" msgstr ""
#: mod/message.php:134 src/Content/Nav.php:273 view/theme/frio/theme.php:234 #: mod/message.php:134 src/Content/Nav.php:287 view/theme/frio/theme.php:235
msgid "Messages" msgid "Messages"
msgstr "" msgstr ""
@ -1980,12 +1984,12 @@ msgstr ""
#: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1509 #: mod/photos.php:1377 mod/photos.php:1434 mod/photos.php:1509
#: src/Module/Contact.php:1104 src/Module/Item/Compose.php:142 #: src/Module/Contact.php:1104 src/Module/Item/Compose.php:142
#: src/Object/Post.php:949 #: src/Object/Post.php:948
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1511 #: mod/photos.php:1379 mod/photos.php:1436 mod/photos.php:1511
#: src/Object/Post.php:489 src/Object/Post.php:951 #: src/Object/Post.php:491 src/Object/Post.php:950
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -2376,7 +2380,7 @@ msgstr ""
msgid "Action after import:" msgid "Action after import:"
msgstr "" msgstr ""
#: mod/settings.php:711 src/Content/Nav.php:270 #: mod/settings.php:711 src/Content/Nav.php:284
msgid "Mark as seen" msgid "Mark as seen"
msgstr "" msgstr ""
@ -3371,7 +3375,7 @@ msgstr ""
msgid "Display membership date in profile" msgid "Display membership date in profile"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:145 src/Content/Nav.php:229 #: src/Content/ForumManager.php:145 src/Content/Nav.php:243
#: src/Content/Text/HTML.php:914 src/Content/Widget.php:533 #: src/Content/Text/HTML.php:914 src/Content/Widget.php:533
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
@ -3405,88 +3409,88 @@ msgstr ""
msgid "@name, !forum, #tags, content" msgid "@name, !forum, #tags, content"
msgstr "" msgstr ""
#: src/Content/Nav.php:169 src/Module/Security/Login.php:141 #: src/Content/Nav.php:183 src/Module/Security/Login.php:141
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
#: src/Content/Nav.php:169 #: src/Content/Nav.php:183
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: src/Content/Nav.php:171 src/Module/Bookmarklet.php:46 #: src/Content/Nav.php:185 src/Module/Bookmarklet.php:46
#: src/Module/Security/Login.php:142 #: src/Module/Security/Login.php:142
msgid "Login" msgid "Login"
msgstr "" msgstr ""
#: src/Content/Nav.php:171 #: src/Content/Nav.php:185
msgid "Sign in" msgid "Sign in"
msgstr "" msgstr ""
#: src/Content/Nav.php:177 src/Module/BaseProfile.php:60 #: src/Content/Nav.php:191 src/Module/BaseProfile.php:60
#: src/Module/Contact.php:663 src/Module/Contact.php:928 #: src/Module/Contact.php:663 src/Module/Contact.php:928
#: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:225 #: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:226
msgid "Status" msgid "Status"
msgstr "" msgstr ""
#: src/Content/Nav.php:177 src/Content/Nav.php:263 #: src/Content/Nav.php:191 src/Content/Nav.php:277
#: view/theme/frio/theme.php:225 #: view/theme/frio/theme.php:226
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" msgstr ""
#: src/Content/Nav.php:178 src/Module/BaseProfile.php:52 #: src/Content/Nav.php:192 src/Module/BaseProfile.php:52
#: src/Module/BaseSettings.php:57 src/Module/Contact.php:665 #: src/Module/BaseSettings.php:57 src/Module/Contact.php:665
#: src/Module/Contact.php:944 src/Module/Profile/Profile.php:237 #: src/Module/Contact.php:944 src/Module/Profile/Profile.php:237
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:226 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:227
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: src/Content/Nav.php:178 view/theme/frio/theme.php:226 #: src/Content/Nav.php:192 view/theme/frio/theme.php:227
msgid "Your profile page" msgid "Your profile page"
msgstr "" msgstr ""
#: src/Content/Nav.php:179 view/theme/frio/theme.php:227 #: src/Content/Nav.php:193 view/theme/frio/theme.php:228
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: src/Content/Nav.php:180 src/Module/BaseProfile.php:76 #: src/Content/Nav.php:194 src/Module/BaseProfile.php:76
#: src/Module/BaseProfile.php:79 view/theme/frio/theme.php:228 #: src/Module/BaseProfile.php:79 view/theme/frio/theme.php:229
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
#: src/Content/Nav.php:180 view/theme/frio/theme.php:228 #: src/Content/Nav.php:194 view/theme/frio/theme.php:229
msgid "Your videos" msgid "Your videos"
msgstr "" msgstr ""
#: src/Content/Nav.php:181 view/theme/frio/theme.php:229 #: src/Content/Nav.php:195 view/theme/frio/theme.php:230
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: src/Content/Nav.php:182 #: src/Content/Nav.php:196
msgid "Personal notes" msgid "Personal notes"
msgstr "" msgstr ""
#: src/Content/Nav.php:182 #: src/Content/Nav.php:196
msgid "Your personal notes" msgid "Your personal notes"
msgstr "" msgstr ""
#: src/Content/Nav.php:202 src/Content/Nav.php:263 #: src/Content/Nav.php:216 src/Content/Nav.php:277
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: src/Content/Nav.php:202 #: src/Content/Nav.php:216
msgid "Home Page" msgid "Home Page"
msgstr "" msgstr ""
#: src/Content/Nav.php:206 src/Module/Register.php:155 #: src/Content/Nav.php:220 src/Module/Register.php:155
#: src/Module/Security/Login.php:102 #: src/Module/Security/Login.php:102
msgid "Register" msgid "Register"
msgstr "" msgstr ""
#: src/Content/Nav.php:206 #: src/Content/Nav.php:220
msgid "Create an account" msgid "Create an account"
msgstr "" msgstr ""
#: src/Content/Nav.php:212 src/Module/Help.php:69 #: src/Content/Nav.php:226 src/Module/Help.php:69
#: src/Module/Settings/TwoFactor/AppSpecific.php:115 #: src/Module/Settings/TwoFactor/AppSpecific.php:115
#: src/Module/Settings/TwoFactor/Index.php:111 #: src/Module/Settings/TwoFactor/Index.php:111
#: src/Module/Settings/TwoFactor/Recovery.php:93 #: src/Module/Settings/TwoFactor/Recovery.php:93
@ -3494,158 +3498,158 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: src/Content/Nav.php:212 #: src/Content/Nav.php:226
msgid "Help and documentation" msgid "Help and documentation"
msgstr "" msgstr ""
#: src/Content/Nav.php:216 #: src/Content/Nav.php:230
msgid "Apps" msgid "Apps"
msgstr "" msgstr ""
#: src/Content/Nav.php:216 #: src/Content/Nav.php:230
msgid "Addon applications, utilities, games" msgid "Addon applications, utilities, games"
msgstr "" msgstr ""
#: src/Content/Nav.php:220 src/Content/Text/HTML.php:899 #: src/Content/Nav.php:234 src/Content/Text/HTML.php:899
#: src/Module/Search/Index.php:99 #: src/Module/Search/Index.php:99
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: src/Content/Nav.php:220 #: src/Content/Nav.php:234
msgid "Search site content" msgid "Search site content"
msgstr "" msgstr ""
#: src/Content/Nav.php:223 src/Content/Text/HTML.php:908 #: src/Content/Nav.php:237 src/Content/Text/HTML.php:908
msgid "Full Text" msgid "Full Text"
msgstr "" msgstr ""
#: src/Content/Nav.php:224 src/Content/Text/HTML.php:909 #: src/Content/Nav.php:238 src/Content/Text/HTML.php:909
#: src/Content/Widget/TagCloud.php:68 #: src/Content/Widget/TagCloud.php:68
msgid "Tags" msgid "Tags"
msgstr "" msgstr ""
#: src/Content/Nav.php:225 src/Content/Nav.php:284 #: src/Content/Nav.php:239 src/Content/Nav.php:298
#: src/Content/Text/HTML.php:910 src/Module/BaseProfile.php:121 #: src/Content/Text/HTML.php:910 src/Module/BaseProfile.php:121
#: src/Module/BaseProfile.php:124 src/Module/Contact.php:863 #: src/Module/BaseProfile.php:124 src/Module/Contact.php:863
#: src/Module/Contact.php:951 view/theme/frio/theme.php:236 #: src/Module/Contact.php:951 view/theme/frio/theme.php:237
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
#: src/Content/Nav.php:244 #: src/Content/Nav.php:258
msgid "Community" msgid "Community"
msgstr "" msgstr ""
#: src/Content/Nav.php:244 #: src/Content/Nav.php:258
msgid "Conversations on this and other servers" msgid "Conversations on this and other servers"
msgstr "" msgstr ""
#: src/Content/Nav.php:248 src/Module/BaseProfile.php:91 #: src/Content/Nav.php:262 src/Module/BaseProfile.php:91
#: src/Module/BaseProfile.php:102 view/theme/frio/theme.php:233 #: src/Module/BaseProfile.php:102 view/theme/frio/theme.php:234
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: src/Content/Nav.php:251 #: src/Content/Nav.php:265
msgid "Directory" msgid "Directory"
msgstr "" msgstr ""
#: src/Content/Nav.php:251 #: src/Content/Nav.php:265
msgid "People directory" msgid "People directory"
msgstr "" msgstr ""
#: src/Content/Nav.php:253 src/Module/BaseAdmin.php:85 #: src/Content/Nav.php:267 src/Module/BaseAdmin.php:85
msgid "Information" msgid "Information"
msgstr "" msgstr ""
#: src/Content/Nav.php:253 #: src/Content/Nav.php:267
msgid "Information about this friendica instance" msgid "Information about this friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:256 src/Module/Admin/Tos.php:59 #: src/Content/Nav.php:270 src/Module/Admin/Tos.php:59
#: src/Module/BaseAdmin.php:95 src/Module/Register.php:163 #: src/Module/BaseAdmin.php:95 src/Module/Register.php:163
#: src/Module/Tos.php:84 #: src/Module/Tos.php:84
msgid "Terms of Service" msgid "Terms of Service"
msgstr "" msgstr ""
#: src/Content/Nav.php:256 #: src/Content/Nav.php:270
msgid "Terms of Service of this Friendica instance" msgid "Terms of Service of this Friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:261 view/theme/frio/theme.php:232 #: src/Content/Nav.php:275 view/theme/frio/theme.php:233
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: src/Content/Nav.php:261 view/theme/frio/theme.php:232 #: src/Content/Nav.php:275 view/theme/frio/theme.php:233
msgid "Conversations from your friends" msgid "Conversations from your friends"
msgstr "" msgstr ""
#: src/Content/Nav.php:267 #: src/Content/Nav.php:281
msgid "Introductions" msgid "Introductions"
msgstr "" msgstr ""
#: src/Content/Nav.php:267 #: src/Content/Nav.php:281
msgid "Friend Requests" msgid "Friend Requests"
msgstr "" msgstr ""
#: src/Content/Nav.php:268 src/Module/BaseNotifications.php:139 #: src/Content/Nav.php:282 src/Module/BaseNotifications.php:139
#: src/Module/Notifications/Introductions.php:54 #: src/Module/Notifications/Introductions.php:54
msgid "Notifications" msgid "Notifications"
msgstr "" msgstr ""
#: src/Content/Nav.php:269 #: src/Content/Nav.php:283
msgid "See all notifications" msgid "See all notifications"
msgstr "" msgstr ""
#: src/Content/Nav.php:270 #: src/Content/Nav.php:284
msgid "Mark all system notifications seen" msgid "Mark all system notifications seen"
msgstr "" msgstr ""
#: src/Content/Nav.php:273 view/theme/frio/theme.php:234 #: src/Content/Nav.php:287 view/theme/frio/theme.php:235
msgid "Private mail" msgid "Private mail"
msgstr "" msgstr ""
#: src/Content/Nav.php:274 #: src/Content/Nav.php:288
msgid "Inbox" msgid "Inbox"
msgstr "" msgstr ""
#: src/Content/Nav.php:275 #: src/Content/Nav.php:289
msgid "Outbox" msgid "Outbox"
msgstr "" msgstr ""
#: src/Content/Nav.php:279 #: src/Content/Nav.php:293
msgid "Accounts" msgid "Accounts"
msgstr "" msgstr ""
#: src/Content/Nav.php:279 #: src/Content/Nav.php:293
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: src/Content/Nav.php:282 src/Module/Admin/Addons/Details.php:114 #: src/Content/Nav.php:296 src/Module/Admin/Addons/Details.php:114
#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:124 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:124
#: src/Module/Welcome.php:52 view/theme/frio/theme.php:235 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:236
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:282 view/theme/frio/theme.php:235 #: src/Content/Nav.php:296 view/theme/frio/theme.php:236
msgid "Account settings" msgid "Account settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:284 view/theme/frio/theme.php:236 #: src/Content/Nav.php:298 view/theme/frio/theme.php:237
msgid "Manage/edit friends and contacts" msgid "Manage/edit friends and contacts"
msgstr "" msgstr ""
#: src/Content/Nav.php:289 src/Module/BaseAdmin.php:125 #: src/Content/Nav.php:303 src/Module/BaseAdmin.php:125
msgid "Admin" msgid "Admin"
msgstr "" msgstr ""
#: src/Content/Nav.php:289 #: src/Content/Nav.php:303
msgid "Site setup and configuration" msgid "Site setup and configuration"
msgstr "" msgstr ""
#: src/Content/Nav.php:292 #: src/Content/Nav.php:306
msgid "Navigation" msgid "Navigation"
msgstr "" msgstr ""
#: src/Content/Nav.php:292 #: src/Content/Nav.php:306
msgid "Site map" msgid "Site map"
msgstr "" msgstr ""
@ -3709,7 +3713,7 @@ msgstr ""
msgid "The end" msgid "The end"
msgstr "" msgstr ""
#: src/Content/Text/HTML.php:893 src/Model/Profile.php:439 #: src/Content/Text/HTML.php:893 src/Model/Profile.php:444
#: src/Module/Contact.php:340 #: src/Module/Contact.php:340
msgid "Follow" msgid "Follow"
msgstr "" msgstr ""
@ -4834,11 +4838,9 @@ msgstr ""
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:2529 src/Object/Post.php:548 #: src/Model/Item.php:2529
msgid "comment" msgid "comment"
msgid_plural "comments" msgstr ""
msgstr[0] ""
msgstr[1] ""
#: src/Model/Item.php:2532 #: src/Model/Item.php:2532
msgid "post" msgid "post"
@ -4861,6 +4863,10 @@ msgstr ""
msgid "view on separate page" msgid "view on separate page"
msgstr "" msgstr ""
#: src/Model/Item.php:3031
msgid "Link to source"
msgstr ""
#: src/Model/Mail.php:120 src/Model/Mail.php:258 #: src/Model/Mail.php:120 src/Model/Mail.php:258
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""
@ -4889,52 +4895,52 @@ msgstr ""
msgid "XMPP:" msgid "XMPP:"
msgstr "" msgstr ""
#: src/Model/Profile.php:441 src/Module/Contact.php:342 #: src/Model/Profile.php:446 src/Module/Contact.php:342
msgid "Unfollow" msgid "Unfollow"
msgstr "" msgstr ""
#: src/Model/Profile.php:443 #: src/Model/Profile.php:448
msgid "Atom feed" msgid "Atom feed"
msgstr "" msgstr ""
#: src/Model/Profile.php:451 src/Module/Contact.php:338 #: src/Model/Profile.php:456 src/Module/Contact.php:338
#: src/Module/Notifications/Introductions.php:186 #: src/Module/Notifications/Introductions.php:186
msgid "Network:" msgid "Network:"
msgstr "" msgstr ""
#: src/Model/Profile.php:481 src/Model/Profile.php:578 #: src/Model/Profile.php:486 src/Model/Profile.php:583
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: src/Model/Profile.php:482 #: src/Model/Profile.php:487
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: src/Model/Profile.php:544 src/Model/Profile.php:629 #: src/Model/Profile.php:549 src/Model/Profile.php:634
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: src/Model/Profile.php:554 #: src/Model/Profile.php:559
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: src/Model/Profile.php:555 #: src/Model/Profile.php:560
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: src/Model/Profile.php:616 #: src/Model/Profile.php:621
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: src/Model/Profile.php:642 #: src/Model/Profile.php:647
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: src/Model/Profile.php:643 #: src/Model/Profile.php:648
msgid "Upcoming events the next 7 days:" msgid "Upcoming events the next 7 days:"
msgstr "" msgstr ""
#: src/Model/Profile.php:818 #: src/Model/Profile.php:823
#, php-format #, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s" msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr "" msgstr ""
@ -10411,63 +10417,63 @@ msgstr ""
msgid "Pulled" msgid "Pulled"
msgstr "" msgstr ""
#: src/Object/Post.php:449 #: src/Object/Post.php:451
msgid "to" msgid "to"
msgstr "" msgstr ""
#: src/Object/Post.php:450 #: src/Object/Post.php:452
msgid "via" msgid "via"
msgstr "" msgstr ""
#: src/Object/Post.php:451 #: src/Object/Post.php:453
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: src/Object/Post.php:452 #: src/Object/Post.php:454
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
#: src/Object/Post.php:490 #: src/Object/Post.php:492
#, php-format #, php-format
msgid "Reply to %s" msgid "Reply to %s"
msgstr "" msgstr ""
#: src/Object/Post.php:493 #: src/Object/Post.php:495
msgid "More" msgid "More"
msgstr "" msgstr ""
#: src/Object/Post.php:511 #: src/Object/Post.php:513
msgid "Notifier task is pending" msgid "Notifier task is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:512 #: src/Object/Post.php:514
msgid "Delivery to remote servers is pending" msgid "Delivery to remote servers is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:513 #: src/Object/Post.php:515
msgid "Delivery to remote servers is underway" msgid "Delivery to remote servers is underway"
msgstr "" msgstr ""
#: src/Object/Post.php:514 #: src/Object/Post.php:516
msgid "Delivery to remote servers is mostly done" msgid "Delivery to remote servers is mostly done"
msgstr "" msgstr ""
#: src/Object/Post.php:515 #: src/Object/Post.php:517
msgid "Delivery to remote servers is done" msgid "Delivery to remote servers is done"
msgstr "" msgstr ""
#: src/Object/Post.php:535 #: src/Object/Post.php:537
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Object/Post.php:536 #: src/Object/Post.php:538
msgid "Show more" msgid "Show more"
msgstr "" msgstr ""
#: src/Object/Post.php:537 #: src/Object/Post.php:539
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""
@ -10869,11 +10875,11 @@ msgstr ""
msgid "Back to top" msgid "Back to top"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:207 #: view/theme/frio/theme.php:208
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:210 #: view/theme/frio/theme.php:211
msgid "Visitor" msgid "Visitor"
msgstr "" msgstr ""

87
view/lang/de/messages.po
View file

@ -49,8 +49,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-04 09:08-0400\n" "POT-Creation-Date: 2021-05-08 12:25+0000\n"
"PO-Revision-Date: 2021-05-04 16:28+0000\n" "PO-Revision-Date: 2021-05-08 16:11+0000\n"
"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n" "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -874,8 +874,11 @@ msgstr "Bitte besuche %s, um die Anfrage zu bearbeiten."
#: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81 #: mod/unfollow.php:82 mod/wall_attach.php:78 mod/wall_attach.php:81
#: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35 #: mod/wall_upload.php:99 mod/wall_upload.php:102 mod/wallmessage.php:35
#: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120 #: mod/wallmessage.php:59 mod/wallmessage.php:96 mod/wallmessage.php:120
#: src/Module/Attach.php:56 src/Module/BaseApi.php:59 #: src/Module/Attach.php:56 src/Module/BaseApi.php:61
#: src/Module/BaseApi.php:65 src/Module/BaseNotifications.php:88 #: src/Module/BaseApi.php:67 src/Module/BaseApi.php:74
#: src/Module/BaseApi.php:80 src/Module/BaseApi.php:87
#: src/Module/BaseApi.php:93 src/Module/BaseApi.php:100
#: src/Module/BaseApi.php:106 src/Module/BaseNotifications.php:88
#: src/Module/Contact.php:385 src/Module/Contact/Advanced.php:43 #: src/Module/Contact.php:385 src/Module/Contact/Advanced.php:43
#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:16 #: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:16
#: src/Module/FriendSuggest.php:44 src/Module/Group.php:45 #: src/Module/FriendSuggest.php:44 src/Module/Group.php:45
@ -1209,8 +1212,8 @@ msgstr "Bitte bestätige Deine Kontaktanfrage bei %s."
#: mod/dfrn_request.php:600 mod/display.php:179 mod/photos.php:836 #: mod/dfrn_request.php:600 mod/display.php:179 mod/photos.php:836
#: mod/videos.php:129 src/Module/Conversation/Community.php:188 #: mod/videos.php:129 src/Module/Conversation/Community.php:188
#: src/Module/Debug/Probe.php:39 src/Module/Debug/WebFinger.php:38 #: src/Module/Debug/Probe.php:39 src/Module/Debug/WebFinger.php:38
#: src/Module/Directory.php:49 src/Module/Search/Index.php:51 #: src/Module/Directory.php:49 src/Module/Search/Index.php:50
#: src/Module/Search/Index.php:56 #: src/Module/Search/Index.php:55
msgid "Public access denied." msgid "Public access denied."
msgstr "Öffentlicher Zugriff verweigert." msgstr "Öffentlicher Zugriff verweigert."
@ -3087,33 +3090,33 @@ msgstr "Diese Methode ist in diesem Modul nicht erlaubt. Erlaubte Methoden sind:
msgid "Page not found." msgid "Page not found."
msgstr "Seite nicht gefunden." msgstr "Seite nicht gefunden."
#: src/BaseModule.php:150 #: src/BaseModule.php:180
msgid "" msgid ""
"The form security token was not correct. This probably happened because the " "The form security token was not correct. This probably happened because the "
"form has been opened for too long (>3 hours) before submitting it." "form has been opened for too long (>3 hours) before submitting it."
msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens, wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
#: src/BaseModule.php:179 #: src/BaseModule.php:209
msgid "All contacts" msgid "All contacts"
msgstr "Alle Kontakte" msgstr "Alle Kontakte"
#: src/BaseModule.php:184 src/Content/Widget.php:238 src/Core/ACL.php:183 #: src/BaseModule.php:214 src/Content/Widget.php:238 src/Core/ACL.php:183
#: src/Module/Contact.php:860 src/Module/PermissionTooltip.php:77 #: src/Module/Contact.php:860 src/Module/PermissionTooltip.php:77
#: src/Module/PermissionTooltip.php:99 #: src/Module/PermissionTooltip.php:99
msgid "Followers" msgid "Followers"
msgstr "Folgende" msgstr "Folgende"
#: src/BaseModule.php:189 src/Content/Widget.php:239 #: src/BaseModule.php:219 src/Content/Widget.php:239
#: src/Module/Contact.php:861 #: src/Module/Contact.php:861
msgid "Following" msgid "Following"
msgstr "Gefolgte" msgstr "Gefolgte"
#: src/BaseModule.php:194 src/Content/Widget.php:240 #: src/BaseModule.php:224 src/Content/Widget.php:240
#: src/Module/Contact.php:862 #: src/Module/Contact.php:862
msgid "Mutual friends" msgid "Mutual friends"
msgstr "Beidseitige Freundschaft" msgstr "Beidseitige Freundschaft"
#: src/BaseModule.php:202 #: src/BaseModule.php:232
msgid "Common" msgid "Common"
msgstr "Gemeinsam" msgstr "Gemeinsam"
@ -3550,7 +3553,7 @@ msgid "Addon applications, utilities, games"
msgstr "Zusätzliche Anwendungen, Dienstprogramme, Spiele" msgstr "Zusätzliche Anwendungen, Dienstprogramme, Spiele"
#: src/Content/Nav.php:220 src/Content/Text/HTML.php:899 #: src/Content/Nav.php:220 src/Content/Text/HTML.php:899
#: src/Module/Search/Index.php:100 #: src/Module/Search/Index.php:99
msgid "Search" msgid "Search"
msgstr "Suche" msgstr "Suche"
@ -3708,38 +3711,38 @@ msgstr "vorige"
msgid "last" msgid "last"
msgstr "letzte" msgstr "letzte"
#: src/Content/Text/BBCode.php:941 src/Content/Text/BBCode.php:1615 #: src/Content/Text/BBCode.php:942 src/Content/Text/BBCode.php:1605
#: src/Content/Text/BBCode.php:1616 #: src/Content/Text/BBCode.php:1606
msgid "Image/photo" msgid "Image/photo"
msgstr "Bild/Foto" msgstr "Bild/Foto"
#: src/Content/Text/BBCode.php:1063 #: src/Content/Text/BBCode.php:1064
#, php-format #, php-format
msgid "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" msgid "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a>%3$s" msgstr "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a>%3$s"
#: src/Content/Text/BBCode.php:1088 src/Model/Item.php:3020 #: src/Content/Text/BBCode.php:1089 src/Model/Item.php:3024
#: src/Model/Item.php:3026 #: src/Model/Item.php:3030
msgid "link to source" msgid "link to source"
msgstr "Link zum Originalbeitrag" msgstr "Link zum Originalbeitrag"
#: src/Content/Text/BBCode.php:1533 src/Content/Text/HTML.php:951 #: src/Content/Text/BBCode.php:1523 src/Content/Text/HTML.php:951
msgid "Click to open/close" msgid "Click to open/close"
msgstr "Zum Öffnen/Schließen klicken" msgstr "Zum Öffnen/Schließen klicken"
#: src/Content/Text/BBCode.php:1564 #: src/Content/Text/BBCode.php:1554
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "$1 hat geschrieben:" msgstr "$1 hat geschrieben:"
#: src/Content/Text/BBCode.php:1618 src/Content/Text/BBCode.php:1619 #: src/Content/Text/BBCode.php:1608 src/Content/Text/BBCode.php:1609
msgid "Encrypted content" msgid "Encrypted content"
msgstr "Verschlüsselter Inhalt" msgstr "Verschlüsselter Inhalt"
#: src/Content/Text/BBCode.php:1832 #: src/Content/Text/BBCode.php:1822
msgid "Invalid source protocol" msgid "Invalid source protocol"
msgstr "Ungültiges Quell-Protokoll" msgstr "Ungültiges Quell-Protokoll"
#: src/Content/Text/BBCode.php:1847 #: src/Content/Text/BBCode.php:1837
msgid "Invalid link protocol" msgid "Invalid link protocol"
msgstr "Ungültiges Link-Protokoll" msgstr "Ungültiges Link-Protokoll"
@ -4891,15 +4894,15 @@ msgstr "Beitrag"
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "Inhaltswarnung: %s" msgstr "Inhaltswarnung: %s"
#: src/Model/Item.php:2985 #: src/Model/Item.php:2989
msgid "bytes" msgid "bytes"
msgstr "Byte" msgstr "Byte"
#: src/Model/Item.php:3014 #: src/Model/Item.php:3018
msgid "View on separate page" msgid "View on separate page"
msgstr "Auf separater Seite ansehen" msgstr "Auf separater Seite ansehen"
#: src/Model/Item.php:3015 #: src/Model/Item.php:3019
msgid "view on separate page" msgid "view on separate page"
msgstr "auf separater Seite ansehen" msgstr "auf separater Seite ansehen"
@ -7257,16 +7260,6 @@ msgstr "Hinweis vom Nutzer"
msgid "Deny" msgid "Deny"
msgstr "Verwehren" msgstr "Verwehren"
#: src/Module/Api/Mastodon/Unimplemented.php:42
#, php-format
msgid "API endpoint \"%s\" is not implemented"
msgstr "API endpoint \"%s\" is not implemented"
#: src/Module/Api/Mastodon/Unimplemented.php:43
msgid ""
"The API endpoint is currently not implemented but might be in the future."
msgstr "The API endpoint is currently not implemented but might be in the future."
#: src/Module/Api/Twitter/ContactEndpoint.php:65 src/Module/Contact.php:400 #: src/Module/Api/Twitter/ContactEndpoint.php:65 src/Module/Contact.php:400
msgid "Contact not found" msgid "Contact not found"
msgstr "Kontakt nicht gefunden" msgstr "Kontakt nicht gefunden"
@ -7369,6 +7362,16 @@ msgstr "Addon Features"
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "Nutzeranmeldungen, die auf Bestätigung warten" msgstr "Nutzeranmeldungen, die auf Bestätigung warten"
#: src/Module/BaseApi.php:114
#, php-format
msgid "API endpoint %s %s is not implemented"
msgstr "API Endpunkt %s %s ist nicht implementiert"
#: src/Module/BaseApi.php:115
msgid ""
"The API endpoint is currently not implemented but might be in the future."
msgstr "The API endpoint is currently not implemented but might be in the future."
#: src/Module/BaseProfile.php:55 src/Module/Contact.php:947 #: src/Module/BaseProfile.php:55 src/Module/Contact.php:947
msgid "Profile Details" msgid "Profile Details"
msgstr "Profildetails" msgstr "Profildetails"
@ -7723,7 +7726,7 @@ msgstr "Verwalte deine Kontaktgruppen"
msgid "Search your contacts" msgid "Search your contacts"
msgstr "Suche in deinen Kontakten" msgstr "Suche in deinen Kontakten"
#: src/Module/Contact.php:883 src/Module/Search/Index.php:193 #: src/Module/Contact.php:883 src/Module/Search/Index.php:192
#, php-format #, php-format
msgid "Results for: %s" msgid "Results for: %s"
msgstr "Ergebnisse für: %s" msgstr "Ergebnisse für: %s"
@ -7963,8 +7966,8 @@ msgstr "Einschließen"
msgid "Hide" msgid "Hide"
msgstr "Verbergen" msgstr "Verbergen"
#: src/Module/Conversation/Community.php:149 src/Module/Search/Index.php:140 #: src/Module/Conversation/Community.php:149 src/Module/Search/Index.php:139
#: src/Module/Search/Index.php:180 #: src/Module/Search/Index.php:179
msgid "No results." msgid "No results."
msgstr "Keine Ergebnisse." msgstr "Keine Ergebnisse."
@ -9146,15 +9149,15 @@ msgid ""
" or <strong>%s</strong> directly on your system." " or <strong>%s</strong> directly on your system."
msgstr "Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. " msgstr "Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. "
#: src/Module/Search/Index.php:55 #: src/Module/Search/Index.php:54
msgid "Only logged in users are permitted to perform a search." msgid "Only logged in users are permitted to perform a search."
msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet." msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet."
#: src/Module/Search/Index.php:77 #: src/Module/Search/Index.php:76
msgid "Only one search per minute is permitted for not logged in users." msgid "Only one search per minute is permitted for not logged in users."
msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet." msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."
#: src/Module/Search/Index.php:191 #: src/Module/Search/Index.php:190
#, php-format #, php-format
msgid "Items tagged with: %s" msgid "Items tagged with: %s"
msgstr "Beiträge, die mit %s getaggt sind" msgstr "Beiträge, die mit %s getaggt sind"

4
view/lang/de/strings.php
View file

@ -1580,8 +1580,6 @@ $a->strings["Request date"] = "Anfragedatum";
$a->strings["No registrations."] = "Keine Neuanmeldungen."; $a->strings["No registrations."] = "Keine Neuanmeldungen.";
$a->strings["Note from the user"] = "Hinweis vom Nutzer"; $a->strings["Note from the user"] = "Hinweis vom Nutzer";
$a->strings["Deny"] = "Verwehren"; $a->strings["Deny"] = "Verwehren";
$a->strings["API endpoint \"%s\" is not implemented"] = "API endpoint \"%s\" is not implemented";
$a->strings["The API endpoint is currently not implemented but might be in the future."] = "The API endpoint is currently not implemented but might be in the future.";
$a->strings["Contact not found"] = "Kontakt nicht gefunden"; $a->strings["Contact not found"] = "Kontakt nicht gefunden";
$a->strings["Profile not found"] = "Profil wurde nicht gefunden"; $a->strings["Profile not found"] = "Profil wurde nicht gefunden";
$a->strings["No installed applications."] = "Keine Applikationen installiert."; $a->strings["No installed applications."] = "Keine Applikationen installiert.";
@ -1607,6 +1605,8 @@ $a->strings["Babel"] = "Babel";
$a->strings["ActivityPub Conversion"] = "Umwandlung nach ActivityPub"; $a->strings["ActivityPub Conversion"] = "Umwandlung nach ActivityPub";
$a->strings["Addon Features"] = "Addon Features"; $a->strings["Addon Features"] = "Addon Features";
$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen, die auf Bestätigung warten"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen, die auf Bestätigung warten";
$a->strings["API endpoint %s %s is not implemented"] = "API Endpunkt %s %s ist nicht implementiert";
$a->strings["The API endpoint is currently not implemented but might be in the future."] = "The API endpoint is currently not implemented but might be in the future.";
$a->strings["Profile Details"] = "Profildetails"; $a->strings["Profile Details"] = "Profildetails";
$a->strings["Only You Can See This"] = "Nur du kannst das sehen"; $a->strings["Only You Can See This"] = "Nur du kannst das sehen";
$a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";

13059
view/lang/ja/messages.po
View file

File diff suppressed because it is too large Load diff

1537
view/lang/ja/strings.php
View file

File diff suppressed because it is too large Load diff

1
view/templates/comment_item.tpl
View file

@ -5,7 +5,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
{{/if}} {{/if}}
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}} {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

34
view/templates/moderated_comment.tpl
View file

@ -1,34 +0,0 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" />
<input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="jsreload" value="{{$jsreload}}" />
<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
</div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div>
<div class="comment-edit-end"></div>
</form>
</div>

1
view/theme/duepuntozero/templates/comment_item.tpl
View file

@ -5,7 +5,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
{{/if}} {{/if}}
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}} {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

61
view/theme/duepuntozero/templates/moderated_comment.tpl
View file

@ -1,61 +0,0 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" />
<input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="jsreload" value="{{$jsreload}}" />
<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
</div>
<ul class="comment-edit-bb-{{$id}}">
<li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="{{$edbold}}"
onclick="insertFormatting('b', {{$id}});"></a></li>
<li><a class="editicon italicbb shadow"
style="cursor: pointer;" title="{{$editalic}}"
onclick="insertFormatting('i', {{$id}});"></a></li>
<li><a class="editicon underlinebb shadow"
style="cursor: pointer;" title="{{$eduline}}"
onclick="insertFormatting('u', {{$id}});"></a></li>
<li><a class="editicon quotebb shadow"
style="cursor: pointer;" title="{{$edquote}}"
onclick="insertFormatting('quote', {{$id}});"></a></li>
<li><a class="editicon codebb shadow"
style="cursor: pointer;" title="{{$edcode}}"
onclick="insertFormatting('code', {{$id}});"></a></li>
<li><a class="editicon imagebb shadow"
style="cursor: pointer;" title="{{$edimg}}"
onclick="insertFormatting('img', {{$id}});"></a></li>
<li><a class="editicon urlbb shadow"
style="cursor: pointer;" title="{{$edurl}}"
onclick="insertFormatting('url', {{$id}});"></a></li>
<li><a class="editicon videobb shadow"
style="cursor: pointer;" title="{{$edvideo}}"
onclick="insertFormatting('video', {{$id}});"></a></li>
</ul>
<div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div>
<div class="comment-edit-end"></div>
</form>
</div>

9
view/theme/frio/scheme/black.css
View file

@ -385,3 +385,12 @@ input[type="text"].tt-input {
.textcomplete-item.active > a { .textcomplete-item.active > a {
background-color: $nav_icon_hover_color !important; background-color: $nav_icon_hover_color !important;
} }
#preview_profile-jot-text, .comment-edit-form .preview {
background-color: $nav_bg;
border-width: 1px;
}
textarea#profile-jot-text:focus + #preview_profile-jot-text, textarea.comment-edit-text:focus + .comment-edit-form .preview {
border-color: $link_color;
}

9
view/theme/frio/scheme/dark.css
View file

@ -345,3 +345,12 @@ input[type="text"].tt-input {
.textcomplete-item.active > a { .textcomplete-item.active > a {
background-color: $nav_icon_hover_color !important; background-color: $nav_icon_hover_color !important;
} }
#preview_profile-jot-text, .comment-edit-form .preview {
background-color: $nav_bg;
border-width: 1px;
}
textarea#profile-jot-text:focus + #preview_profile-jot-text, textarea.comment-edit-text:focus + .comment-edit-form .preview {
border-color: $link_color;
}

1
view/theme/frio/templates/comment_item.tpl
View file

@ -5,7 +5,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}">
{{/if}} {{/if}}
<form class="comment-edit-form" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post"> <form class="comment-edit-form" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}} {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

26
view/theme/frio/templates/nav.tpl
View file

@ -1,11 +1,11 @@
{{* we have modified the navmenu (look at function frio_remote_nav() ) to have remote links. $nav.userinfo is a new variable and replaces the original $userinfo variable *}} {{* we have modified the navmenu (look at function frio_remote_nav() ) to have remote links. *}}
{{if $nav.userinfo}} {{if $userinfo}}
<header> <header>
{{* {{$langselector}} *}} {{* {{$langselector}} *}}
<div id="site-location">{{$sitelocation}}</div> <div id="site-location">{{$sitelocation}}</div>
<div id="banner" class="hidden-sm hidden-xs"> <div id="banner" class="hidden-sm hidden-xs">
{{* show on remote/visitor connections an other logo which symols that fact*}} {{* show on remote/visitor connections an other logo which symbols that fact*}}
{{if $nav.remote}} {{if $nav.remote}}
<a href="{{$baseurl}}"> <a href="{{$baseurl}}">
<div id="remote-logo-img" aria-label="{{$home}}"></div> <div id="remote-logo-img" aria-label="{{$home}}"></div>
@ -141,7 +141,6 @@
{{if $nav.search}} {{if $nav.search}}
<li id="search-box" class="hidden-xs"> <li id="search-box" class="hidden-xs">
<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}"> <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
<!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input accesskey="s" id="nav-search-input-field" class="form-control form-search" <input accesskey="s" id="nav-search-input-field" class="form-control form-search"
type="text" name="q" data-toggle="tooltip" title="{{$search_hint}}" type="text" name="q" data-toggle="tooltip" title="{{$search_hint}}"
@ -154,17 +153,17 @@
{{/if}} {{/if}}
{{* The user dropdown menu *}} {{* The user dropdown menu *}}
{{if $nav.userinfo}} {{if $userinfo}}
<li id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs"> <li id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
<button accesskey="u" id="main-menu" class="btn-link dropdown-toggle nav-avatar" <button accesskey="u" id="main-menu" class="btn-link dropdown-toggle nav-avatar"
data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false"
aria-controls="nav-user-menu"> aria-controls="nav-user-menu">
<div aria-hidden="true" class="user-title pull-left hidden-xs hidden-sm hidden-md"> <div aria-hidden="true" class="user-title pull-left hidden-xs hidden-sm hidden-md">
<strong>{{$nav.userinfo.name}}</strong><br> <strong>{{$userinfo.name}}</strong><br>
{{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}} {{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
</div> </div>
<img id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}"> <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
<span class="caret"></span> <span class="caret"></span>
</button> </button>
@ -300,9 +299,9 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<li role="presentation" class="list-group-item"> <li role="presentation" class="list-group-item">
<img src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" <img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"
style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;"> style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;">
{{$nav.userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}} {{$userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}
</li> </li>
{{foreach $nav.usermenu as $usermenu}} {{foreach $nav.usermenu as $usermenu}}
<li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" <li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}"
@ -369,11 +368,8 @@
</div><!-- end of div for navbar width--> </div><!-- end of div for navbar width-->
</div><!-- /.container --> </div><!-- /.container -->
</nav><!-- /.navbar --> </nav><!-- /.navbar -->
{{/if}} {{else}}
{{* The navbar for users which are not logged in *}}
{{* The navbar for users which are not logged in *}}
{{if $nav.userinfo == ''}}
<nav class="navbar navbar-fixed-top"> <nav class="navbar navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header pull-left"> <div class="navbar-header pull-left">
@ -402,14 +398,12 @@
</div> </div>
</div> </div>
</nav> </nav>
{{/if}} {{/if}}
{{* provide a a search input for mobile view, which expands by pressing the search icon *}} {{* provide a a search input for mobile view, which expands by pressing the search icon *}}
<div id="search-mobile" class="hidden-lg hidden-md hidden-sm collapse row well"> <div id="search-mobile" class="hidden-lg hidden-md hidden-sm collapse row well">
<div class="col-xs-12"> <div class="col-xs-12">
<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}"> <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
<!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="q" <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="q"
data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}"> data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">

35
view/theme/frio/theme.php
View file

@ -186,10 +186,11 @@ function frio_contact_photo_menu(App $a, &$args)
* Some links will point to the local pages because the user would expect * Some links will point to the local pages because the user would expect
* local page (these pages are: search, community, help, apps, directory). * local page (these pages are: search, community, help, apps, directory).
* *
* @param App $a The App class * @param App $a The App class
* @param array $nav The original nav menu * @param array $nav_info The original nav info array: nav, banner, userinfo, sitelocation
* @throws Exception
*/ */
function frio_remote_nav(App $a, array &$nav) function frio_remote_nav(App $a, array &$nav_info)
{ {
// get the homelink from $_XSESSION // get the homelink from $_XSESSION
$homelink = Model\Profile::getMyURL(); $homelink = Model\Profile::getMyURL();
@ -204,16 +205,16 @@ function frio_remote_nav(App $a, array &$nav)
$remoteUser = Contact::selectFirst($fields, ['uid' => $a->user['uid'], 'self' => true]); $remoteUser = Contact::selectFirst($fields, ['uid' => $a->user['uid'], 'self' => true]);
} elseif (!local_user() && remote_user()) { } elseif (!local_user() && remote_user()) {
$remoteUser = Contact::getById(remote_user(), $fields); $remoteUser = Contact::getById(remote_user(), $fields);
$nav['remote'] = DI::l10n()->t('Guest'); $nav_info['nav']['remote'] = DI::l10n()->t('Guest');
} elseif (Model\Profile::getMyURL()) { } elseif (Model\Profile::getMyURL()) {
$remoteUser = Contact::getByURL($homelink, null, $fields); $remoteUser = Contact::getByURL($homelink, null, $fields);
$nav['remote'] = DI::l10n()->t('Visitor'); $nav_info['nav']['remote'] = DI::l10n()->t('Visitor');
} else { } else {
$remoteUser = null; $remoteUser = null;
} }
if (DBA::isResult($remoteUser)) { if (DBA::isResult($remoteUser)) {
$nav['userinfo'] = [ $nav_info['userinfo'] = [
'icon' => Contact::getMicro($remoteUser), 'icon' => Contact::getMicro($remoteUser),
'name' => $remoteUser['name'], 'name' => $remoteUser['name'],
]; ];
@ -222,19 +223,19 @@ function frio_remote_nav(App $a, array &$nav)
if (!local_user() && !empty($server_url) && !is_null($remoteUser)) { if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
// user menu // user menu
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
$nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; $nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
$nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')]; $nav_info['nav']['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
$nav['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')]; $nav_info['nav']['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
// navbar links // navbar links
$nav['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; $nav_info['nav']['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
$nav['events'] = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')]; $nav_info['nav']['events'] = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
$nav['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')]; $nav_info['nav']['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
$nav['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')]; $nav_info['nav']['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
$nav['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')]; $nav_info['nav']['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
$nav['sitename'] = DI::config()->get('config', 'sitename'); $nav_info['nav']['sitename'] = DI::config()->get('config', 'sitename');
} }
} }

1
view/theme/quattro/templates/comment_item.tpl
View file

@ -1,6 +1,5 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> <form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}} {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

1
view/theme/vier/templates/comment_item.tpl
View file

@ -5,7 +5,6 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
{{/if}} {{/if}}
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> <form class="comment-edit-form" style="display: block;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <input type="hidden" name="parent" value="{{$parent}}" />
{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}} {{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}

2
view/theme/vier/templates/wall_thread.tpl
View file

@ -155,7 +155,7 @@
{{/if}} {{/if}}
</div> </div>
<div class="wall-item-location">{{$item.location_html nofilter}} {{$item.postopts}}</div> <div class="wall-item-location">{{$item.location_html nofilter}}</div>
<div class="wall-item-actions-isevent"> <div class="wall-item-actions-isevent">
</div> </div>