aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG126
-rw-r--r--Zotlabs/Module/Admin/Profs.php39
-rw-r--r--Zotlabs/Module/Admin/Site.php25
-rw-r--r--Zotlabs/Module/Cover_photo.php8
-rw-r--r--Zotlabs/Module/Directory.php7
-rw-r--r--Zotlabs/Module/Follow.php22
-rw-r--r--Zotlabs/Module/Hashtags.php27
-rw-r--r--Zotlabs/Module/Import.php19
-rw-r--r--Zotlabs/Module/Item.php6
-rw-r--r--Zotlabs/Module/New_channel.php20
-rw-r--r--Zotlabs/Module/Profile_photo.php6
-rw-r--r--Zotlabs/Module/Settings/Featured.php19
-rw-r--r--Zotlabs/Module/Setup.php20
-rw-r--r--Zotlabs/Module/Sitelist.php4
-rw-r--r--Zotlabs/Module/Thing.php5
-rw-r--r--Zotlabs/Module/Wfinger.php3
-rw-r--r--Zotlabs/Update/_1204.php6
-rw-r--r--Zotlabs/Update/_1205.php11
-rw-r--r--Zotlabs/Update/_1207.php24
-rw-r--r--Zotlabs/Update/_1208.php26
-rw-r--r--Zotlabs/Update/_1209.php26
-rw-r--r--Zotlabs/Widget/Newmember.php8
-rwxr-xr-xboot.php7
-rw-r--r--include/bbcode.php30
-rw-r--r--include/channel.php8
-rw-r--r--include/conversation.php6
-rw-r--r--include/event.php22
-rw-r--r--include/follow.php15
-rwxr-xr-xinclude/items.php11
-rw-r--r--include/socgraph.php13
-rw-r--r--include/text.php22
-rw-r--r--include/zot.php17
-rw-r--r--install/schema_mysql.sql9
-rw-r--r--install/schema_postgres.sql4
-rw-r--r--view/css/mod_admin.css18
-rw-r--r--view/de-de/hmessages.po3060
-rw-r--r--view/de-de/hstrings.php210
-rw-r--r--view/js/autocomplete.js16
-rw-r--r--view/js/main.js6
-rw-r--r--view/js/mod_cover_photo.js80
-rw-r--r--view/js/mod_profile_photo.js82
-rw-r--r--view/pdl/mod_moderate.pdl4
-rw-r--r--view/pdl/mod_thing.pdl7
-rw-r--r--view/php/theme_init.php2
-rw-r--r--view/theme/redbasic/img/screenshot.jpgbin199131 -> 0 bytes
-rw-r--r--view/theme/redbasic/img/screenshot.pngbin0 -> 131184 bytes
-rw-r--r--view/theme/redbasic/schema/dark.css45
-rw-r--r--view/tpl/admin_settings_features.tpl4
-rwxr-xr-xview/tpl/admin_site.tpl4
-rwxr-xr-xview/tpl/cover_photo.tpl83
-rw-r--r--view/tpl/generic_addon_settings.tpl8
-rwxr-xr-xview/tpl/navbar_default.tpl2
-rwxr-xr-xview/tpl/navbar_tucson.tpl2
-rw-r--r--view/tpl/notifications_widget.tpl3
-rwxr-xr-xview/tpl/peoplefind.tpl2
-rwxr-xr-xview/tpl/profile_edit.tpl16
-rwxr-xr-xview/tpl/profile_photo.tpl86
-rwxr-xr-xview/tpl/settings.tpl16
-rwxr-xr-xview/tpl/settings_addons.tpl2
-rwxr-xr-xview/tpl/settings_display.tpl12
-rwxr-xr-xview/tpl/settings_features.tpl4
61 files changed, 2625 insertions, 1770 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6e540a04d..ad5e004c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,129 @@
+Hubzilla 3.2 (2018-03-09)
+ - Improve rendering of Readme files in plugin settings
+ - Add pdl file for mod moderate
+ - Update redbasic theme screenshot
+ - Restrict mail messages to max_import_size
+ - Add pdl file for mod thing
+ - Add federation property to webfinger
+ - Provide new member widget which sits beneath the notifications for the first 60 days after an account creation
+ - Rename Addon/Feature settings to Addon Settings
+ - Move privacy groups to the newly created Access Control and Permissions tab
+ - Move oauth_client management and guest access tokens to features rather than auto-enabling at various feature levels
+ - Change undo_post_tagging() to emit quoted tags rather than using underscore replacement if they contain spaces
+ - Require directory servers to be using some modern form of encryption
+ - Change icon set from font-awesome to fork-awesome
+ - Provide opt-out link and text with notification emails
+ - Alter image selection widget to accept/submit on choose (github issue #979)
+ - If hide_in_statistics is set, only include the total channels count and no other statistical info in siteinfo.json
+ - Mark connections where we do not have post_comments permissions with an no entry sign
+ - Click your own profile photo to change it if loged in
+ - Remove street address info from the default basic profile fields
+ - Handle error logging in on cloud page (post method not implemented)
+ - Cloud 'view-as-tiles' toggle wasn't available for guests and they are the most likely to prefer that view
+ - Provide DB compatibility for poll and voting implementations across several platforms
+ - Remove the unused ZotDriver and ProtoDriver classes
+ - Move dreport from zot to lib
+ - Move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the zot6 re-org
+ - Add event resource_id to iconfig so Diaspora can search on it without looking inside JSON objects
+ - Trim non-existent/deprecated plugins from siteinfo plugin list
+ - Add 'Validate' button to new_channel page
+ - Do not show summary if it is equal to body
+ - Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely
+ - Crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)
+ - Refactor OAuth2Server a bit
+ - Refactor of the DB update system
+ - Extend the oauth2 storage driver so that we can use our own channel table
+ - Provide option to block the public stream unless authenticated
+ - Refactor shares and urn shares into activities
+ - Show likes and dislikes in notices if always_show_in_notices is set
+ - Add hidden config to disallow anonymous comments (github issue #972)
+ - Add flexibility to prefix/suffix string translations for jquery.timeago
+ - Make post titles searchable (github issue #975)
+ - Implement zot6 delivery
+ - Remove mobile_detect library
+ - Separate the parsing of author information from the parsing of item/activity information in feedutils
+ - Provide summaries in feeds under very limited cases
+ - Redirect to the email_validation page if login was attempted after account creation but prior to successful verification
+ - Iprove workflow for form based email validation when auto_channel_create is in effect
+ - Provide a default video image if nothing else is available
+ - Surface the ability to change the landing page after channel creation
+ - Create the 'go' module to present several possible things to do after channel creation
+ - Add unit test for dba_pdo driver class
+ - Add unit test for \DBA factory
+ - Usability improvements to registration/verification workflow
+ - Don't do any bbcode translation within code blocks (except baseurl, observer, and linefeeds)
+ - Improve browser language detection
+ - Remove unused prototype importer template and obsolete reflection cms importer
+ - Update to bootstrap 4 stable
+ - Implement caching of notifications in browser session storage
+ - Code cleanup and simplification in mod_like
+ - Implement new cropper library
+ - Better notifications for edit post/comments which may have been originally posted long ago
+ - Ensure filter words are not empty in include/items.php
+ - Change query in mod search to be compatible with postgres
+ - Provide channel list function in the zot api
+ - Remove deprecated 'qcomment' feature
+ - Simplify webserver logic flow
+ - Simplify interactions with the get_features hook
+ - Provide a local pubstream option (content from this site only)
+ - Simplify dir_tagadelic dramatically
+ - Surface the article feature
+ - Add summary bbcode tag
+ - Move markdown-in-posts/comments feature to plugin
+ - Support tables in markdown posts/comments
+
+
+ Bugfixes
+ - Fix javascript error if there are no notifications
+ - Fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers
+ - Fix unable to reset profile fields to defaults in admin/profs by emptying the textarea
+ ⁻ Fix issues with accordions related to bootstrap upgrade
+ - Fix empty dob is set to the date of the first profile save
+ - Fix several email validation issues
+ - Fix issue if logged in locally and mod_display returns nothing owned by your uid; retry with known public uids rather than issue 'permission denied'
+ - Fix public stream app permission check to match the recent fixes to the Module
+ - Fix issues with delivery of edited posts to forums
+ - Fix autoname test
+ - Fix issue where self and pending connections were visible in connections when not loged in
+ - Fix bad query in mod defperms
+ - Fix issue where gnusocial likes were not recognised as like activity
+ - Fix manual queue invocation
+ - Fix unable to delete accounts using tickboxes on admin/accounts
+ - Fix a PHP7.2 warning when a channel has no cards
+ - Fix unable to delete permission groups with space in name (github issue #920)
+
+ Addons
+ Statistic: fix reporting of incorrect register policy in nodeinfo
+ Diaspora: diaspora_init_relay: calls diaspora_import_author with too many arguments
+ Pubcrawl: provide a system 'allowed' for to match the system setting for other protocols
+ Diaspora: fix issue with sending diaspora profile change messages over diaspora_v2
+ Diaspora: provide limited but hopefully adequate support for new Diaspora html5 audio/video
+ Pubcrawl: send zot context with follow requests
+ Pubcrawl: add video to the set of message types we process
+ Pubcrawl: support for activitypub media
+ Openclipatar: remove extra details for each image
+ Diaspora: initial work on event participation
+ Statistic: remove the friendica protocol from nodeinfo until it is fully implemented
+ Statistic: re-arrange the order of the .host-meta/nodeinfo links
+ Pubcrawl: add share verb to activitystreams translator
+ Pubcrawl: post public posts to syschannel
+ Statistics: fix legacy statistics.json interface
+ Gnusocial: improve error checking when processing a salmon message
+ Dirstats: fix sql syntax error
+ Pubcrawl: possibly reduce constraint violations for xchan_store_lowlevel (duplicate entry)
+ Diaspora: ensure we process Friendica-over-Diaspora yearless birthdays correctly
+ Chess: added simple history browsing controls to spectator view
+ Diaspora: support post/comment edits
+ Diaspora: don't redirect fetch requests for non-Diaspora wall-to-wall and forum posts unless they can be redirected to a Diaspora protocol site
+ Chess: added support for publicly visible games
+ Phpmailer: add quickstart notes
+ Chess: choose random color if no color is chosen
+ New Plugin: mdpost - markdown in posts/comments, migrated from core to addon
+ Diaspora: provide a configuration option to import the diaspora firehose, otherwise only import content matching subscribed tags
+ NSFW: load images only after click on the button
+ Twitter: provide configurable tweet length until such time as 280 becomes universal
+
+
Hubzilla 3.0 (2018-01-09)
- Updated homeinstall script
- Sort cloud directory by 1. is_dir and 2. name
diff --git a/Zotlabs/Module/Admin/Profs.php b/Zotlabs/Module/Admin/Profs.php
index b3da09cb7..eb2501d43 100644
--- a/Zotlabs/Module/Admin/Profs.php
+++ b/Zotlabs/Module/Admin/Profs.php
@@ -9,17 +9,37 @@ class Profs {
if(array_key_exists('basic',$_REQUEST)) {
$arr = explode(',',$_REQUEST['basic']);
- for($x = 0; $x < count($arr); $x ++)
- if(trim($arr[$x]))
- $arr[$x] = trim($arr[$x]);
- set_config('system','profile_fields_basic',$arr);
-
+ array_walk($arr,'array_trim');
+ $narr = [];
+ if(count($arr)) {
+ foreach($arr as $a) {
+ if(strlen($a)) {
+ $narr[] = $a;
+ }
+ }
+ }
+ if(! $narr)
+ del_config('system','profile_fields_basic');
+ else
+ set_config('system','profile_fields_basic',$narr);
+
+
if(array_key_exists('advanced',$_REQUEST)) {
$arr = explode(',',$_REQUEST['advanced']);
- for($x = 0; $x < count($arr); $x ++)
- if(trim($arr[$x]))
- $arr[$x] = trim($arr[$x]);
- set_config('system','profile_fields_advanced',$arr);
+ array_walk($arr,'array_trim');
+ $narr = [];
+ if(count($arr)) {
+ foreach($arr as $a) {
+ if(strlen($a)) {
+ $narr[] = $a;
+ }
+ }
+ }
+ if(! $narr)
+ del_config('system','profile_fields_advanced');
+ else
+ set_config('system','profile_fields_advanced',$narr);
+
}
goaway(z_root() . '/admin/profs');
}
@@ -98,6 +118,7 @@ class Profs {
$basic = '';
$barr = array();
$fields = get_profile_fields_basic();
+
if(! $fields)
$fields = get_profile_fields_basic(1);
if($fields) {
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index 880dbbe4b..95d44d754 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -24,7 +24,7 @@ class Site {
$siteinfo = ((x($_POST,'siteinfo')) ? trim($_POST['siteinfo']) : '');
$language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
$theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : '');
- $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : '');
+// $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : '');
// $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : '');
$maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0);
@@ -38,7 +38,12 @@ class Site {
$site_sellpage = ((x($_POST,'site_sellpage')) ? notags(trim($_POST['site_sellpage'])) : '');
$site_location = ((x($_POST,'site_location')) ? notags(trim($_POST['site_location'])) : '');
$frontpage = ((x($_POST,'frontpage')) ? notags(trim($_POST['frontpage'])) : '');
- $firstpage = ((x(trim($_POST,'firstpage'))) ? notags(trim($_POST['firstpage'])) : 'profiles');
+ $firstpage = ((x($_POST,'firstpage')) ? notags(trim($_POST['firstpage'])) : 'profiles');
+ $first_page = ((x($_POST,'first_page')) ? notags(trim($_POST['first_page'])) : 'profiles');
+ // check value after trim
+ if(! $first_page) {
+ $first_page = 'profiles';
+ }
$mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0);
$directory_server = ((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : '');
$allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
@@ -82,7 +87,7 @@ class Site {
set_config('system', 'maxloadavg', $maxloadavg);
set_config('system', 'frontpage', $frontpage);
set_config('system', 'sellpage', $site_sellpage);
- set_config('system', 'workflow_channel_next', $firstpage);
+ set_config('system', 'workflow_channel_next', $first_page);
set_config('system', 'site_location', $site_location);
set_config('system', 'mirror_frontpage', $mirror_frontpage);
set_config('system', 'sitename', $sitename);
@@ -122,11 +127,11 @@ class Site {
set_config('system','siteinfo',$siteinfo);
set_config('system', 'language', $language);
set_config('system', 'theme', $theme);
- if ( $theme_mobile === '---' ) {
- del_config('system', 'mobile_theme');
- } else {
- set_config('system', 'mobile_theme', $theme_mobile);
- }
+// if ( $theme_mobile === '---' ) {
+// del_config('system', 'mobile_theme');
+// } else {
+// set_config('system', 'mobile_theme', $theme_mobile);
+// }
// set_config('system','site_channel', $site_channel);
set_config('system','maximagesize', $maximagesize);
@@ -305,7 +310,7 @@ class Site {
'$siteinfo' => array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here")),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
- '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
+// '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
// '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")),
'$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')),
'$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
@@ -345,7 +350,7 @@ class Site {
'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
'$sellpage' => array('site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root())),
- '$firstpage' => array('firstpage', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')),
+ '$first_page' => array('first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Recommend: profiles, go, or settings')),
'$location' => array('site_location', t('Optional: site location'), get_config('system','site_location',''), t('Region or country')),
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 047bcf3d4..56e35f912 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -207,7 +207,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
}
}
- $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata);
+ $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
$ph = photo_factory($imagedata, $filetype);
if(! $ph->is_valid()) {
@@ -364,6 +364,12 @@ class Cover_photo extends \Zotlabs\Web\Controller {
'$embedPhotosModalTitle' => t('Use a photo from your albums'),
'$embedPhotosModalCancel' => t('Cancel'),
'$embedPhotosModalOK' => t('OK'),
+ '$modalchooseimages' => t('Choose images to embed'),
+ '$modalchoosealbum' => t('Choose an album'),
+ '$modaldiffalbum' => t('Choose a different album'),
+ '$modalerrorlist' => t('Error getting album list'),
+ '$modalerrorlink' => t('Error getting photo link'),
+ '$modalerroralbum' => t('Error getting album'),
'$form_security_token' => get_form_security_token("cover_photo"),
/// @FIXME - yuk
'$select' => t('Select existing photo'),
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index b1552a694..62a1670f9 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -17,7 +17,7 @@ class Directory extends \Zotlabs\Web\Controller {
intval(local_channel()),
dbesc($_GET['ignore'])
);
- goaway(z_root() . '/directory?suggest=1');
+ goaway(z_root() . '/directory?f=&suggest=1');
}
$observer = get_observer_hash();
@@ -101,6 +101,11 @@ class Directory extends \Zotlabs\Web\Controller {
if($suggest) {
$r = suggestion_query(local_channel(),get_observer_hash());
+
+ if(! $r) {
+ notice( t('No default suggestions were found.') . EOL);
+ return;
+ }
// Remember in which order the suggestions were
$addresses = array();
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index d8a86d0ce..d441f21d2 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -14,21 +14,26 @@ class Follow extends \Zotlabs\Web\Controller {
}
$uid = local_channel();
- $url = notags(trim($_REQUEST['url']));
+ $url = notags(trim(unpunify($_REQUEST['url'])));
$return_url = $_SESSION['return_url'];
$confirm = intval($_REQUEST['confirm']);
-
+ $interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
$channel = \App::get_channel();
- $result = new_contact($uid,$url,$channel,true,$confirm);
+ $result = new_contact($uid,$url,$channel,$interactive,$confirm);
if($result['success'] == false) {
if($result['message'])
notice($result['message']);
- goaway($return_url);
+ if($interactive) {
+ goaway($return_url);
+ }
+ else {
+ json_return_and_die($result);
+ }
}
- info( t('Channel added.') . EOL);
+ info( t('Connection added.') . EOL);
$clone = array();
foreach($result['abook'] as $k => $v) {
@@ -53,7 +58,12 @@ class Follow extends \Zotlabs\Web\Controller {
if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss'))
\Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
- goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
+ if($interactive) {
+ goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
+ }
+ else {
+ json_return_and_die([ 'success' => true ]);
+ }
}
diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php
new file mode 100644
index 000000000..edb631871
--- /dev/null
+++ b/Zotlabs/Module/Hashtags.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Hashtags extends \Zotlabs\Web\Controller {
+
+ function init() {
+ $result = [];
+
+ $t = escape_tags($_REQUEST['t']);
+ if(! $t)
+ json_return_and_die($result);
+
+ $r = q("select distinct(term) from term where term like '%s' and ttype = %d order by term",
+ dbesc($t . '%'),
+ intval(TERM_HASHTAG)
+ );
+ if($r) {
+ foreach($r as $rv) {
+ $result[] = [ 'text' => strtolower($rv['term']) ];
+ }
+ }
+
+ json_return_and_die($result);
+ }
+} \ No newline at end of file
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 36bd72310..81c405f00 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -114,15 +114,16 @@ class Import extends \Zotlabs\Web\Controller {
return;
}
- if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
- $v1 = substr($data['compatibility']['database'],-4);
- $v2 = substr(DB_UPDATE_VERSION,-4);
- if($v2 > $v1) {
- $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
- notice($t);
- }
-
- }
+// This is only an info message but it is alarming to folks who then report failure with this as the cause, when in fact we ignore this completely.
+// if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
+// $v1 = substr($data['compatibility']['database'],-4);
+// $v2 = substr(DB_UPDATE_VERSION,-4);
+// if($v2 > $v1) {
+// $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
+// notice($t);
+// }
+//
+// }
if($moving)
$seize = 1;
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 3f857030b..fba2ef7a4 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -830,6 +830,12 @@ class Item extends \Zotlabs\Web\Controller {
$datarray['plink'] = $plink;
$datarray['route'] = $route;
+
+ // A specific ACL over-rides public_policy completely
+
+ if(! empty_acl($datarray))
+ $datarray['public_policy'] = '';
+
if($iconfig)
$datarray['iconfig'] = $iconfig;
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index 548f28c4f..ea9f27447 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -16,8 +16,15 @@ class New_channel extends \Zotlabs\Web\Controller {
require_once('library/urlify/URLify.php');
$result = array('error' => false, 'message' => '');
$n = trim($_REQUEST['name']);
-
- $x = strtolower(\URLify::transliterate($n));
+
+ $x = false;
+
+ if(get_config('system','unicode_usernames')) {
+ $x = punify(mb_strtolower($n));
+ }
+
+ if((! $x) || strlen($x) > 64)
+ $x = strtolower(\URLify::transliterate($n));
$test = array();
@@ -43,7 +50,14 @@ class New_channel extends \Zotlabs\Web\Controller {
$result = array('error' => false, 'message' => '');
$n = trim($_REQUEST['nick']);
- $x = strtolower(\URLify::transliterate($n));
+ $x = false;
+
+ if(get_config('system','unicode_usernames')) {
+ $x = punify(mb_strtolower($n));
+ }
+
+ if((! $x) || strlen($x) > 64)
+ $x = strtolower(\URLify::transliterate($n));
$test = array();
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 44b7c18c6..2ce8686b9 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -463,6 +463,12 @@ class Profile_photo extends \Zotlabs\Web\Controller {
'$embedPhotosModalTitle' => t('Use a photo from your albums'),
'$embedPhotosModalCancel' => t('Cancel'),
'$embedPhotosModalOK' => t('OK'),
+ '$modalchooseimages' => t('Choose images to embed'),
+ '$modalchoosealbum' => t('Choose an album'),
+ '$modaldiffalbum' => t('Choose a different album'),
+ '$modalerrorlist' => t('Error getting album list'),
+ '$modalerrorlink' => t('Error getting photo link'),
+ '$modalerroralbum' => t('Error getting album'),
'$form_security_token' => get_form_security_token("profile_photo"),
'$select' => t('Select existing photo'),
));
diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index 1da139206..542a05363 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -57,7 +57,10 @@ class Featured {
}
call_hooks('feature_settings', $settings_addons);
-
+
+ $this->sortpanels($settings_addons);
+
+
$tpl = get_markup_template("settings_addons.tpl");
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_featured"),
@@ -67,5 +70,15 @@ class Featured {
));
return $o;
}
-
-} \ No newline at end of file
+
+ function sortpanels(&$s) {
+ $a = explode('<div class="panel">',$s);
+ if($a) {
+ usort($a,'featured_sort');
+ $s = implode('<div class="panel">',$a);
+ }
+ }
+
+}
+
+
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 8e7fbbddf..a3832d156 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -563,16 +563,20 @@ class Setup extends \Zotlabs\Web\Controller {
$status = true;
$help = '';
- if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
- (!file_exists('.htconfig.php') && !is_writable('.')) ) {
- $status = false;
- $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
- $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
- $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder.').EOL;
- $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "install/INSTALL.txt" for instructions.').EOL;
+ $fname = '.htconfig.php';
+
+ if((file_exists($fname) && is_writable($fname)) ||
+ (! (file_exists($fname) && is_writable('.')))) {
+ $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
+ return;
}
- $this->check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
+ $status = false;
+ $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
+ $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
+ $help .= t('Please see install/INSTALL.txt for additional information.');
+
+ $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
}
/**
diff --git a/Zotlabs/Module/Sitelist.php b/Zotlabs/Module/Sitelist.php
index e7d4187b7..2ac5ed1b8 100644
--- a/Zotlabs/Module/Sitelist.php
+++ b/Zotlabs/Module/Sitelist.php
@@ -32,7 +32,7 @@ class Sitelist extends \Zotlabs\Web\Controller {
$result = array('success' => false);
- $r = q("select count(site_url) as total from site where site_type = %d $sql_extra ",
+ $r = q("select count(site_url) as total from site where site_type = %d and site_dead = 0 $sql_extra ",
intval(SITE_TYPE_ZOT)
);
@@ -42,7 +42,7 @@ class Sitelist extends \Zotlabs\Web\Controller {
$result['start'] = $start;
$result['limit'] = $limit;
- $r = q("select * from site where site_type = %d $sql_extra $sql_order $sql_limit",
+ $r = q("select * from site where site_type = %d and site_dead = 0 $sql_extra $sql_order $sql_limit",
intval(SITE_TYPE_ZOT)
);
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index f816632ab..c3d8ff802 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -20,6 +20,11 @@ class Thing extends \Zotlabs\Web\Controller {
$channel = \App::get_channel();
+ if($_SERVER['REQUEST_METHOD'] === 'GET' && argc() < 2) {
+ profile_load($channel['channel_address']);
+ }
+
+
$term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : '');
$name = escape_tags($_REQUEST['term']);
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 753721d27..81d4beaed 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -123,7 +123,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
$result['properties'] = [
'http://webfinger.net/ns/name' => $r[0]['channel_name'],
'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
- 'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey']
+ 'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
+ 'http://purl.org/zot/federation' => 'zot'
];
foreach($aliases as $alias)
diff --git a/Zotlabs/Update/_1204.php b/Zotlabs/Update/_1204.php
index 93c2e4e3f..0b9204b9b 100644
--- a/Zotlabs/Update/_1204.php
+++ b/Zotlabs/Update/_1204.php
@@ -8,11 +8,11 @@ class _1204 {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE poll ADD poll_guid text NOT NULL");
- $r2 = q("create index \"poll_guid_idx\" on poll \"poll_guid\"");
+ $r2 = q("create index \"poll_guid_idx\" on poll (\"poll_guid\")");
$r3 = q("ALTER TABLE poll_elm ADD pelm_guid text NOT NULL");
- $r4 = q("create index \"pelm_guid_idx\" on poll_elm \"pelm_guid\"");
+ $r4 = q("create index \"pelm_guid_idx\" on poll_elm (\"pelm_guid\")");
$r5 = q("ALTER TABLE vote ADD vote_guid text NOT NULL");
- $r6 = q("create index \"vote_guid_idx\" on vote \"vote_guid\"");
+ $r6 = q("create index \"vote_guid_idx\" on vote (\"vote_guid\")");
$r = ($r1 && $r2 && $r3 && $r4 && $r5 && $r6);
}
diff --git a/Zotlabs/Update/_1205.php b/Zotlabs/Update/_1205.php
index 5384f183e..968833726 100644
--- a/Zotlabs/Update/_1205.php
+++ b/Zotlabs/Update/_1205.php
@@ -7,6 +7,17 @@ class _1205 {
function run() {
if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+
+ q("ALTER TABLE item DROP INDEX title");
+ q("ALTER TABLE item DROP INDEX body");
+ q("ALTER TABLE item DROP INDEX allow_cid");
+ q("ALTER TABLE item DROP INDEX allow_gid");
+ q("ALTER TABLE item DROP INDEX deny_cid");
+ q("ALTER TABLE item DROP INDEX deny_gid");
+ q("ALTER TABLE item DROP INDEX item_flags");
+ q("ALTER TABLE item DROP INDEX item_restrict");
+ q("ALTER TABLE item DROP INDEX aid");
+
$r = q("ALTER TABLE item
DROP INDEX item_private,
ADD INDEX uid_item_private (uid, item_private),
diff --git a/Zotlabs/Update/_1207.php b/Zotlabs/Update/_1207.php
new file mode 100644
index 000000000..f53bc46ae
--- /dev/null
+++ b/Zotlabs/Update/_1207.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1207 {
+
+ function run() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+ $r = q("ALTER TABLE item
+ DROP INDEX resource_type
+ ");
+
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+ }
+ else {
+ return UPDATE_SUCCESS;
+ }
+
+ }
+
+}
diff --git a/Zotlabs/Update/_1208.php b/Zotlabs/Update/_1208.php
new file mode 100644
index 000000000..4cbcf4322
--- /dev/null
+++ b/Zotlabs/Update/_1208.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1208 {
+
+ function run() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r1 = q("ALTER TABLE poll ADD poll_author text NOT NULL");
+ $r2 = q("create index \"poll_author_idx\" on poll \"poll_author\"");
+
+ $r = ($r1 && $r2);
+ }
+ else {
+ $r = q("ALTER TABLE `poll` ADD `poll_author` VARCHAR(191) NOT NULL AFTER `poll_votes`,
+ ADD INDEX `poll_author` (`poll_author`)");
+ }
+
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+
+ }
+
+}
diff --git a/Zotlabs/Update/_1209.php b/Zotlabs/Update/_1209.php
new file mode 100644
index 000000000..5ec449395
--- /dev/null
+++ b/Zotlabs/Update/_1209.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1209 {
+
+ function run() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' ");
+ $r2 = q("create index \"pelm_order_idx\" on poll_elm \"pelm_order\"");
+
+ $r = ($r1 && $r2);
+ }
+ else {
+ $r = q("ALTER TABLE `poll_elm` ADD `pelm_order` int(11) NOT NULL DEFAULT 0,
+ ADD INDEX `pelm_order` (`pelm_order`)");
+ }
+
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+
+ }
+
+}
diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
index 898942ccc..cdb70e23d 100644
--- a/Zotlabs/Widget/Newmember.php
+++ b/Zotlabs/Widget/Newmember.php
@@ -39,9 +39,9 @@ class Newmember {
t('Find and Connect with others'),
[
- 'directory' => t('View the channel directory'),
- 'suggest' => t('View friend suggestions'),
- 'connections' => t('Manage your connections'),
+ 'directory' => t('View the directory'),
+ 'directory?f=&suggest=1' => t('View friend suggestions'),
+ 'connections' => t('Manage your connections'),
],
t('Communicate'),
@@ -64,7 +64,7 @@ class Newmember {
// hack to put this in the correct spot of the array
if($site_firehose || $net_firehose) {
- $options[5]['pubstream'] = t('View public stream. Warning: not moderated');
+ $options[5]['pubstream'] = t('View public stream');
}
$o = replace_macros(get_markup_template('new_member.tpl'), [
diff --git a/boot.php b/boot.php
index 534503966..44466b26c 100755
--- a/boot.php
+++ b/boot.php
@@ -50,10 +50,11 @@ require_once('include/attach.php');
require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '3.3.1' );
-define ( 'ZOT_REVISION', '1.3' );
+define ( 'STD_VERSION', '3.3.2' );
+define ( 'ZOT_REVISION', '6.0a' );
-define ( 'DB_UPDATE_VERSION', 1206 );
+
+define ( 'DB_UPDATE_VERSION', 1209 );
define ( 'PROJECT_BASE', __DIR__ );
diff --git a/include/bbcode.php b/include/bbcode.php
index 03a46444b..b33766757 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -668,6 +668,31 @@ function bb_fixtable_lf($match) {
}
+function bbtopoll($s) {
+
+ $pl = [];
+
+ $match = '';
+ if(! preg_match("/\[poll=(.*?)\](.*?)\[\/poll\]/ism",$s,$match)) {
+ return null;
+ }
+ $pl['poll_id'] = $match[1];
+ $pl['poll_question'] = $match[2];
+
+ $match = '';
+ if(preg_match_all("/\[poll\-answer=(.*?)\](.*?)\[\/poll\-answer\]/is",$s,$match,PREG_SET_ORDER)) {
+ $pl['answer'] = [];
+ foreach($match as $m) {
+ $ans = [ 'answer_id' => $m[1], 'answer_text' => $m[2] ];
+ $pl['answer'][] = $ans;
+ }
+ }
+
+ return $pl;
+
+}
+
+
function parseIdentityAwareHTML($Text) {
// Hide all [noparse] contained bbtags by spacefying them
@@ -766,6 +791,11 @@ function bbcode($Text, $options = []) {
$ev = bbtoevent($Text);
+ // and the same with polls
+
+ $pl = bbtopoll($Text);
+
+
// process [observer] tags before we do anything else because we might
// be stripping away stuff that then doesn't need to be worked on anymore
diff --git a/include/channel.php b/include/channel.php
index a8ddfa978..c94f5c657 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1126,8 +1126,7 @@ function channel_export_items($channel_id, $start, $finish) {
/**
* @brief Loads a profile into the App structure.
*
- * The function requires a writeable copy of the main App structure, and the
- * nickname of a valid channel.
+ * The function requires the nickname of a valid channel.
*
* Permissions of the current observer are checked. If a restricted profile is available
* to the current observer, that will be loaded instead of the channel default profile.
@@ -1235,7 +1234,7 @@ function profile_load($nickname, $profile = '') {
);
if($z) {
$p[0]['picdate'] = $z[0]['xchan_photo_date'];
- $p[0]['reddress'] = str_replace('@','&#x40;',$z[0]['xchan_addr']);
+ $p[0]['reddress'] = str_replace('@','&#x40;',unpunify($z[0]['xchan_addr']));
}
// fetch user tags if this isn't the default profile
@@ -1256,7 +1255,7 @@ function profile_load($nickname, $profile = '') {
App::$profile = $p[0];
App::$profile_uid = $p[0]['profile_uid'];
- App::$page['title'] = App::$profile['channel_name'] . " - " . channel_reddress(App::$profile);
+ App::$page['title'] = App::$profile['channel_name'] . " - " . unpunify(channel_reddress(App::$profile));
App::$profile['permission_to_view'] = $can_view_profile;
@@ -1897,6 +1896,7 @@ function is_public_profile() {
function get_profile_fields_basic($filter = 0) {
$profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null);
+
if(! $profile_fields_basic)
$profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
diff --git a/include/conversation.php b/include/conversation.php
index 0bb9c769a..6374267eb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
$contact = App::$contacts[$item['author_xchan']];
else
if($local_channel && $item['author']['xchan_addr'])
- $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
+ $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0';
if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
'menu' => 'follow',
'title' => t('Connect'),
'icon' => 'fw',
- 'action' => '',
- 'href' => $follow_url
+ 'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
+ 'href' => '#',
];
}
diff --git a/include/event.php b/include/event.php
index 1077a3c64..84a16e8be 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1322,3 +1322,25 @@ function translate_type($type) {
return [$type, t('Other') . ' (' . $type . ')'];
}
}
+
+
+function cal_store_lowlevel($arr) {
+
+ $store = [
+ 'cal_aid' => ((array_key_exists('cal_aid',$arr)) ? $arr['cal_aid'] : 0),
+ 'cal_uid' => ((array_key_exists('cal_uid',$arr)) ? $arr['cal_uid'] : 0),
+ 'cal_hash' => ((array_key_exists('cal_hash',$arr)) ? $arr['cal_hash'] : ''),
+ 'cal_name' => ((array_key_exists('cal_name',$arr)) ? $arr['cal_name'] : ''),
+ 'uri' => ((array_key_exists('uri',$arr)) ? $arr['uri'] : ''),
+ 'logname' => ((array_key_exists('logname',$arr)) ? $arr['logname'] : ''),
+ 'pass' => ((array_key_exists('pass',$arr)) ? $arr['pass'] : ''),
+ 'ctag' => ((array_key_exists('ctag',$arr)) ? $arr['ctag'] : ''),
+ 'synctoken' => ((array_key_exists('synctoken',$arr)) ? $arr['synctoken'] : ''),
+ 'cal_types' => ((array_key_exists('cal_types',$arr)) ? $arr['cal_types'] : ''),
+ ];
+
+ return create_table_from_array('cal', $store);
+
+}
+
+
diff --git a/include/follow.php b/include/follow.php
index 0843802c5..a63fe66ea 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -88,9 +88,18 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
// Premium channel, set confirm before callback to avoid recursion
- if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm))
- goaway(zid($j['connect_url']));
-
+ if(array_key_exists('connect_url',$j) && (! $confirm)) {
+ if($interactive) {
+ goaway(zid($j['connect_url']));
+ }
+ else {
+ $result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']);
+ logger('mod_follow: ' . $result['message']);
+ return $result;
+ }
+ }
+
+
// do we have an xchan and hubloc?
// If not, create them.
diff --git a/include/items.php b/include/items.php
index 790b91c88..7faa1b9ec 100755
--- a/include/items.php
+++ b/include/items.php
@@ -969,6 +969,10 @@ function import_author_unknown($x) {
return false;
}
+function empty_acl($item) {
+ return (($item['allow_cid'] === EMPTY_STR && $item['allow_gid'] === EMPTY_STR && $item['deny_cid'] === EMPTY_STR && $item['deny_gid'] === EMPTY_STR) ? true : false);
+}
+
function encode_item($item,$mirror = false) {
$x = array();
$x['type'] = 'activity';
@@ -1412,6 +1416,13 @@ function get_mail_elements($x) {
}
else {
$arr['body'] = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
+
+ $maxlen = get_max_import_size();
+
+ if($maxlen && mb_strlen($arr['body']) > $maxlen) {
+ $arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8');
+ logger('message length exceeds max_import_size: truncated');
+ }
}
$arr['title'] = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');
diff --git a/include/socgraph.php b/include/socgraph.php
index 87a880202..6cddbbaac 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -52,7 +52,7 @@ function poco_load($xchan = '', $url = null) {
elseif($s['return_code'] == 404)
logger('poco_load: nothing found');
else
- logger('poco_load: returns ' . print_r($s,true));
+ logger('poco_load: returns ' . print_r($s,true), LOGGER_DATA);
return;
}
@@ -288,11 +288,14 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) {
function update_suggestions() {
- $dirmode = get_config('system', 'directory_mode');
- if($dirmode === false)
- $dirmode = DIRECTORY_MODE_NORMAL;
+ $dirmode = get_config('system', 'directory_mode', DIRECTORY_MODE_NORMAL);
- if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
+ if($dirmode == DIRECTORY_MODE_STANDALONE) {
+ poco_load('', z_root() . '/poco');
+ return;
+ }
+
+ if($dirmode == DIRECTORY_MODE_PRIMARY) {
$url = z_root() . '/sitelist';
}
else {
diff --git a/include/text.php b/include/text.php
index c82fad517..c1e064857 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3311,4 +3311,26 @@ function purify_filename($s) {
return $s;
}
+// callback for sorting the settings/featured entries.
+
+function featured_sort($a,$b) {
+ $s1 = substr($a,strpos($a,'id='),20);
+ $s2 = substr($b,strpos($b,'id='),20);
+ return(strcmp($s1,$s2));
+}
+
+
+function punify($s) {
+ require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php');
+ $x = new idna_convert(['encoding' => 'utf8']);
+ return $x->encode($s);
+
+}
+
+function unpunify($s) {
+ require_once('vendor/simplepie/simplepie/idn/idna_convert.class.php');
+ $x = new idna_convert(['encoding' => 'utf8']);
+ return $x->decode($s);
+
+}
diff --git a/include/zot.php b/include/zot.php
index 25e30ccbc..c11cace2a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -589,13 +589,16 @@ function zot_refresh($them, $channel = null, $force = false) {
// If there is a default group for this channel, add this connection to it
-
- $default_group = $channel['channel_default_group'];
- if($default_group) {
- require_once('include/group.php');
- $g = group_rec_byhash($channel['channel_id'],$default_group);
- if($g)
- group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
+ // for pending connections this will happens at acceptance time.
+
+ if(! intval($new_connection[0]['abook_pending'])) {
+ $default_group = $channel['channel_default_group'];
+ if($default_group) {
+ require_once('include/group.php');
+ $g = group_rec_byhash($channel['channel_id'],$default_group);
+ if($g)
+ group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
+ }
}
unset($new_connection[0]['abook_id']);
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 5cd04467d..0d098d661 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -659,13 +659,10 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `uid_item_retained` (`uid`, `item_retained`),
KEY `uid_item_private` (`uid`, `item_private`),
KEY `uid_resource_type` (`uid`, `resource_type`),
- KEY `aid` (`aid`),
KEY `owner_xchan` (`owner_xchan`),
KEY `author_xchan` (`author_xchan`),
KEY `resource_id` (`resource_id`),
KEY `resource_type` (`resource_type`),
- KEY `item_restrict` (`item_restrict`),
- KEY `item_flags` (`item_flags`),
KEY `commented` (`commented`),
KEY `verb` (`verb`),
KEY `obj_type` (`obj_type`),
@@ -969,12 +966,14 @@ CREATE TABLE IF NOT EXISTS `poll` (
`poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`poll_guid` varchar(191) NOT NULL,
`poll_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
+ `poll_author` varchar(191) NOT NULL,
`poll_desc` text NOT NULL,
`poll_flags` int(11) NOT NULL DEFAULT 0 ,
`poll_votes` int(11) NOT NULL DEFAULT 0 ,
PRIMARY KEY (`poll_id`),
KEY `poll_guid` (`poll_guid`),
KEY `poll_channel` (`poll_channel`),
+ KEY `poll_author` (`poll_author`),
KEY `poll_flags` (`poll_flags`),
KEY `poll_votes` (`poll_votes`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -986,10 +985,12 @@ CREATE TABLE IF NOT EXISTS `poll_elm` (
`pelm_desc` text NOT NULL,
`pelm_flags` int(11) NOT NULL DEFAULT 0 ,
`pelm_result` float NOT NULL DEFAULT 0 ,
+ `pelm_order` int(11) NOT NULL DEFAULT 0 ,
PRIMARY KEY (`pelm_id`),
KEY `pelm_guid` (`pelm_guid`),
KEY `pelm_poll` (`pelm_poll`),
- KEY `pelm_result` (`pelm_result`)
+ KEY `pelm_result` (`pelm_result`),
+ KEY `pelm_order` (`pelm_order`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE IF NOT EXISTS `profdef` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 84b6a554a..a4f6e9253 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -944,6 +944,7 @@ CREATE TABLE "poll" (
"poll_id" serial NOT NULL,
"poll_guid" text NOT NULL,
"poll_channel" bigint NOT NULL DEFAULT '0',
+ "poll_author" text NOT NULL,
"poll_desc" text NOT NULL,
"poll_flags" bigint NOT NULL DEFAULT '0',
"poll_votes" bigint NOT NULL DEFAULT '0',
@@ -952,6 +953,7 @@ CREATE TABLE "poll" (
);
create index "poll_guid" on poll ("poll_guid");
create index "poll_channel" on poll ("poll_channel");
+create index "poll_author" on poll ("poll_author");
create index "poll_flags" on poll ("poll_flags");
create index "poll_votes" on poll ("poll_votes");
CREATE TABLE "poll_elm" (
@@ -961,11 +963,13 @@ CREATE TABLE "poll_elm" (
"pelm_desc" text NOT NULL,
"pelm_flags" bigint NOT NULL DEFAULT '0',
"pelm_result" float NOT NULL DEFAULT '0',
+ "pelm_order" numeric(6) NOT NULL DEFAULT '0',
PRIMARY KEY ("pelm_id")
);
create index "pelm_guid" on poll_elm ("pelm_guid");
create index "pelm_poll" on poll_elm ("pelm_poll");
create index "pelm_result" on poll_elm ("pelm_result");
+create index "pelm_order" on poll_elm ("pelm_order");
CREATE TABLE "profdef" (
"id" serial NOT NULL,
diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css
index 409744402..5e22fc90c 100644
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -70,3 +70,21 @@
margin-top: 0px !important;
margin-left: 0px !important;
}
+
+pre code {
+ background: #F5F5F5;
+ font-family: Courier, monospace;
+ font-size: 1em;
+ padding: 1em 1.5em;
+ display: block;
+ white-space: pre-wrap;
+}
+
+code {
+ background: #F5F5F5;
+ font-family: Courier, monospace;
+ font-size: 1em;
+ display: inline;
+ padding: 0.2em 0.2em;
+ white-space: pre-wrap;
+} \ No newline at end of file
diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po
index f68a96c22..53dcc0d43 100644
--- a/view/de-de/hmessages.po
+++ b/view/de-de/hmessages.po
@@ -11,22 +11,24 @@
# Ettore Atalan <atalanttore@googlemail.com>, 2015-2017
# Frank Dieckmann <frank@lumina-verte.org>, 2013
# Harald Klimach <harald@klimachs.de>, 2016
+# Herbert Thielen <thielen@hs-worms.de>, 2018
+# Holger - <holger.froese@gmail.com>, 2018
# JooBee <d13@raclan.de>, 2014
# Kai <kai@proppower.de>, 2015
# Oliver <post@toktan.org>, 2015-2017
-# Phellmes <forum@suschka.de>, 2014,2016-2017
+# Phellmes <forum@suschka.de>, 2014,2016-2018
# sasiflo <transiflex@sasiflo.de>, 2014
# Steff <steff@digitalesecho.de>, 2015-2016
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016-2017
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016-2018
# zottel <transifex@zottel.net>, 2015
# sasiflo <transiflex@sasiflo.de>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 12:54+0100\n"
-"PO-Revision-Date: 2017-12-19 11:56+0000\n"
+"POT-Creation-Date: 2018-03-01 08:51+0100\n"
+"PO-Revision-Date: 2018-03-04 23:22+0000\n"
"Last-Translator: Phellmes <forum@suschka.de>\n"
"Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -164,13 +166,13 @@ msgid "Special - Group Repository"
msgstr "Speziell - Gruppenarchiv"
#: ../../Zotlabs/Access/PermissionRoles.php:287
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Settings/Channel.php:474
-#: ../../Zotlabs/Module/Connedit.php:936 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Register.php:221 ../../include/selectors.php:49
+#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Settings/Channel.php:473
+#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
#: ../../include/selectors.php:66 ../../include/selectors.php:104
-#: ../../include/selectors.php:140 ../../include/event.php:1308
-#: ../../include/event.php:1315 ../../include/connections.php:689
+#: ../../include/selectors.php:140 ../../include/event.php:1315
+#: ../../include/event.php:1322 ../../include/connections.php:689
#: ../../include/connections.php:696
msgid "Other"
msgstr "Andere"
@@ -184,7 +186,7 @@ msgstr "Benutzerdefiniert/Expertenmodus"
#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Cards.php:29 ../../Zotlabs/Module/Webpages.php:33
+#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33
#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198
msgid "Requested profile is not available."
msgstr "Das angefragte Profil ist nicht verfügbar."
@@ -199,7 +201,7 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21
#: ../../Zotlabs/Module/Article_edit.php:51
#: ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/New_channel.php:102
#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
#: ../../Zotlabs/Module/Moderate.php:13
#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275
@@ -211,11 +213,11 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400
#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../Zotlabs/Module/Profile_photo.php:307
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:228
-#: ../../Zotlabs/Module/Item.php:245 ../../Zotlabs/Module/Item.php:255
-#: ../../Zotlabs/Module/Item.php:1085 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Profile_photo.php:302
+#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
+#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
+#: ../../Zotlabs/Module/Item.php:1099 ../../Zotlabs/Module/Page.php:34
#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
@@ -226,15 +228,15 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
#: ../../Zotlabs/Module/Editwebpage.php:89
#: ../../Zotlabs/Module/Editwebpage.php:107
#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:68 ../../Zotlabs/Module/Webpages.php:118
+#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Like.php:184 ../../Zotlabs/Module/Suggest.php:28
+#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
#: ../../Zotlabs/Module/Register.php:77
#: ../../Zotlabs/Module/Cover_photo.php:281
#: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:404 ../../Zotlabs/Module/Network.php:15
+#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15
#: ../../Zotlabs/Module/Filestorage.php:15
#: ../../Zotlabs/Module/Filestorage.php:70
#: ../../Zotlabs/Module/Filestorage.php:85
@@ -244,7 +246,7 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
#: ../../Zotlabs/Module/Service_limits.php:11
#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51
#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:169
+#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
#: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
#: ../../addon/gitwiki/Mod_Gitwiki.php:196
#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40
@@ -252,9 +254,9 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
#: ../../include/attach.php:270 ../../include/attach.php:284
#: ../../include/attach.php:293 ../../include/attach.php:366
#: ../../include/attach.php:380 ../../include/attach.php:387
-#: ../../include/attach.php:469 ../../include/attach.php:1008
-#: ../../include/attach.php:1082 ../../include/attach.php:1247
-#: ../../include/items.php:3633 ../../include/photos.php:27
+#: ../../include/attach.php:469 ../../include/attach.php:1019
+#: ../../include/attach.php:1093 ../../include/attach.php:1258
+#: ../../include/items.php:3656 ../../include/photos.php:27
msgid "Permission denied."
msgstr "Berechtigung verweigert."
@@ -263,7 +265,7 @@ msgstr "Berechtigung verweigert."
msgid "Block Name"
msgstr "Block-Name"
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2288
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402
msgid "Blocks"
msgstr "Blöcke"
@@ -282,11 +284,11 @@ msgid "Edited"
msgstr "Geändert"
#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:146
+#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118
#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Cards.php:96 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Storage/Browser.php:273 ../../Zotlabs/Storage/Browser.php:379
+#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
+#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382
#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
msgid "Create"
msgstr "Erstelle"
@@ -296,15 +298,15 @@ msgstr "Erstelle"
#: ../../Zotlabs/Module/Admin/Profs.php:154
#: ../../Zotlabs/Module/Settings/Oauth.php:149
#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:260
-#: ../../Zotlabs/Module/Connections.php:297
-#: ../../Zotlabs/Module/Connections.php:317 ../../Zotlabs/Module/Wiki.php:202
+#: ../../Zotlabs/Module/Connections.php:265
+#: ../../Zotlabs/Module/Connections.php:303
+#: ../../Zotlabs/Module/Connections.php:323 ../../Zotlabs/Module/Wiki.php:202
#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112
#: ../../Zotlabs/Module/Layouts.php:193
#: ../../Zotlabs/Module/Editwebpage.php:142
#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:399
-#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:285
+#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:409
+#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:288
#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162
#: ../../addon/gitwiki/Mod_Gitwiki.php:151
#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297
@@ -321,19 +323,19 @@ msgstr "Teilen"
#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
#: ../../Zotlabs/Module/Admin/Channels.php:149
#: ../../Zotlabs/Module/Admin/Profs.php:155
#: ../../Zotlabs/Module/Settings/Oauth.php:150
#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:268
+#: ../../Zotlabs/Module/Connections.php:273
#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Group.php:179
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179
#: ../../Zotlabs/Module/Profiles.php:803
#: ../../Zotlabs/Module/Editwebpage.php:167
#: ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:400
-#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:286
+#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410
+#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289
#: ../../include/conversation.php:690 ../../include/conversation.php:733
msgid "Delete"
msgstr "Löschen"
@@ -363,6 +365,7 @@ msgid "Invitation limit exceeded. Please contact your site administrator."
msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
#: ../../Zotlabs/Module/Invite.php:82
+#: ../../addon/notifyadmin/notifyadmin.php:40
#, php-format
msgid "%s : Message delivery failed."
msgstr "%s : Nachricht konnte nicht zugestellt werden."
@@ -423,35 +426,36 @@ msgstr "3. Klicke auf [Verbinden]"
#: ../../Zotlabs/Module/Connect.php:98
#: ../../Zotlabs/Module/Admin/Features.php:66
#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Zotlabs/Module/Admin/Accounts.php:167
#: ../../Zotlabs/Module/Admin/Logs.php:84
#: ../../Zotlabs/Module/Admin/Channels.php:147
#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:289
#: ../../Zotlabs/Module/Admin/Profs.php:157
#: ../../Zotlabs/Module/Admin/Account_edit.php:74
#: ../../Zotlabs/Module/Admin/Security.php:104
#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Channel.php:489
+#: ../../Zotlabs/Module/Settings/Channel.php:488
#: ../../Zotlabs/Module/Settings/Features.php:47
#: ../../Zotlabs/Module/Settings/Tokens.php:168
#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:52
-#: ../../Zotlabs/Module/Settings/Display.php:209
+#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Zotlabs/Module/Settings/Display.php:192
#: ../../Zotlabs/Module/Settings/Oauth.php:87
#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345
#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082
#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240
#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98
-#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:904
+#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887
#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242
+#: ../../Zotlabs/Module/Email_validation.php:40
#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:754
+#: ../../Zotlabs/Lib/ThreadItem.php:750
#: ../../Zotlabs/Widget/Eventstools.php:16
#: ../../Zotlabs/Widget/Wiki_pages.php:40
#: ../../Zotlabs/Widget/Wiki_pages.php:97
@@ -465,7 +469,7 @@ msgstr "3. Klicke auf [Verbinden]"
#: ../../addon/likebanner/likebanner.php:57
#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:816
+#: ../../addon/diaspora/diaspora.php:822
#: ../../addon/gitwiki/Mod_Gitwiki.php:155
#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84
#: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161
@@ -480,8 +484,8 @@ msgstr "3. Klicke auf [Verbinden]"
#: ../../addon/statusnet/statusnet.php:322
#: ../../addon/statusnet/statusnet.php:380
#: ../../addon/statusnet/statusnet.php:432
-#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:217
-#: ../../addon/twitter/twitter.php:259
+#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218
+#: ../../addon/twitter/twitter.php:265
#: ../../addon/smileybutton/smileybutton.php:219
#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
@@ -490,21 +494,16 @@ msgstr "3. Klicke auf [Verbinden]"
msgid "Submit"
msgstr "Absenden"
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Cards.php:38
-#: ../../Zotlabs/Module/Cards.php:178 ../../Zotlabs/Lib/Apps.php:224
-#: ../../include/conversation.php:1890 ../../include/features.php:122
-#: ../../include/nav.php:490
-msgid "Cards"
-msgstr "Karten"
+#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124
+#: ../../include/nav.php:469
+msgid "Articles"
+msgstr "Artikel"
#: ../../Zotlabs/Module/Articles.php:95
msgid "Add Article"
msgstr "Artikel hinzufügen"
-#: ../../Zotlabs/Module/Articles.php:178 ../../include/nav.php:501
-msgid "Articles"
-msgstr "Artikel"
-
#: ../../Zotlabs/Module/Editlayout.php:79
#: ../../Zotlabs/Module/Article_edit.php:17
#: ../../Zotlabs/Module/Article_edit.php:33
@@ -533,7 +532,7 @@ msgstr "Layout bearbeiten"
#: ../../Zotlabs/Module/Import_items.php:120
#: ../../Zotlabs/Module/Cloud.php:111 ../../Zotlabs/Module/Group.php:74
#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Web/WebServer.php:168
+#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
#: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109
#: ../../include/items.php:358
@@ -548,7 +547,7 @@ msgstr "Ungültiger Profil-Identifikator"
msgid "Profile Visibility Editor"
msgstr "Profil-Sichtbarkeits-Editor"
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1633
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1634
msgid "Profile"
msgstr "Profil"
@@ -576,9 +575,9 @@ msgstr "Zusammenfassung:"
#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273
-#: ../../Zotlabs/Lib/Apps.php:744 ../../Zotlabs/Lib/Apps.php:822
+#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:832
#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:842
+#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:853
#: ../../include/conversation.php:1160
msgid "Unknown"
msgstr "Unbekannt"
@@ -691,10 +690,12 @@ msgstr "Alles löschen"
#: ../../Zotlabs/Module/Settings/Oauth.php:88
#: ../../Zotlabs/Module/Settings/Oauth.php:114
#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375
-#: ../../Zotlabs/Module/Connedit.php:942 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Profile_photo.php:464
+#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../addon/gitwiki/Mod_Gitwiki.php:244
#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386
#: ../../include/conversation.php:1435
msgid "Cancel"
@@ -709,85 +710,85 @@ msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen
#: ../../Zotlabs/Module/Admin/Channels.php:159
#: ../../Zotlabs/Module/Settings/Oauth.php:89
#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Storage/Browser.php:280
+#: ../../Zotlabs/Storage/Browser.php:283
#: ../../Zotlabs/Widget/Wiki_page_history.php:22
#: ../../addon/rendezvous/rendezvous.php:172
#: ../../addon/gitwiki/Mod_Gitwiki.php:158
msgid "Name"
msgstr "Name"
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
msgid "Organisation"
msgstr "Organisation"
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
msgid "Title"
msgstr "Titel"
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
#: ../../Zotlabs/Module/Profiles.php:789
msgid "Phone"
msgstr "Telefon"
#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:928 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:790
#: ../../addon/openid/MysqlProvider.php:56
#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:1769
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1775
msgid "Email"
msgstr "E-Mail"
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
#: ../../Zotlabs/Module/Profiles.php:791
msgid "Instant messenger"
msgstr "Sofortnachrichtendienst"
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
#: ../../Zotlabs/Module/Profiles.php:792
msgid "Website"
msgstr "Webseite"
#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Profiles.php:502
+#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
#: ../../Zotlabs/Module/Profiles.php:793
msgid "Address"
msgstr "Adresse"
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
#: ../../Zotlabs/Module/Profiles.php:794
msgid "Note"
msgstr "Hinweis"
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1301
+#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1308
#: ../../include/connections.php:682
msgid "Mobile"
msgstr "Mobil"
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1302
+#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1309
#: ../../include/connections.php:683
msgid "Home"
msgstr "Home"
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:935
-#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1305
+#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1312
#: ../../include/connections.php:686
msgid "Work"
msgstr "Arbeit"
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
#: ../../Zotlabs/Module/Profiles.php:799
#: ../../addon/jappixmini/jappixmini.php:368
msgid "Add Contact"
msgstr "Kontakt hinzufügen"
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:938
+#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
#: ../../Zotlabs/Module/Profiles.php:800
msgid "Add Field"
msgstr "Feld hinzufügen"
@@ -796,36 +797,36 @@ msgstr "Feld hinzufügen"
#: ../../Zotlabs/Module/Admin/Plugins.php:453
#: ../../Zotlabs/Module/Settings/Oauth.php:42
#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Lib/Apps.php:383
+#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Lib/Apps.php:393
msgid "Update"
msgstr "Aktualisieren"
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:943
+#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
msgid "P.O. Box"
msgstr "Postfach"
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:944
+#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
msgid "Additional"
msgstr "Zusätzlich"
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:945
+#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
msgid "Street"
msgstr "Straße"
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:946
+#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
msgid "Locality"
msgstr "Ortschaft"
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:947
+#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
msgid "Region"
msgstr "Region"
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:948
+#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
msgid "ZIP Code"
msgstr "Postleitzahl"
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:949
+#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
#: ../../Zotlabs/Module/Profiles.php:760
msgid "Country"
msgstr "Land"
@@ -843,7 +844,7 @@ msgid "This site is not a directory server"
msgstr "Diese Webseite ist kein Verzeichnisserver"
#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
-#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:431
+#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:508
msgid "You must be logged in to see this page."
msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
@@ -919,10 +920,14 @@ msgid ""
" please import or restore these in date order (oldest first)."
msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
-#: ../../Zotlabs/Module/Hq.php:136
-msgid "Welcome to hubzilla!"
+#: ../../Zotlabs/Module/Hq.php:140
+msgid "Welcome to Hubzilla!"
msgstr "Willkommen bei Hubzilla!"
+#: ../../Zotlabs/Module/Hq.php:140
+msgid "You have got no unseen posts..."
+msgstr "Du hast keine ungelesenen Beiträge..."
+
#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540
#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
@@ -930,25 +935,25 @@ msgstr "Willkommen bei Hubzilla!"
msgid "Public access denied."
msgstr "Öffentlichen Zugriff verweigert."
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:313
-#: ../../Zotlabs/Lib/Apps.php:250 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/text.php:1029 ../../include/text.php:1041
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:211
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../include/text.php:1051 ../../include/text.php:1063
+#: ../../include/acl_selectors.php:118 ../../include/nav.php:179
msgid "Search"
msgstr "Suche"
-#: ../../Zotlabs/Module/Search.php:225
+#: ../../Zotlabs/Module/Search.php:226
#, php-format
msgid "Items tagged with: %s"
msgstr "Beiträge mit Schlagwort: %s"
-#: ../../Zotlabs/Module/Search.php:227
+#: ../../Zotlabs/Module/Search.php:228
#, php-format
msgid "Search results for: %s"
msgstr "Suchergebnisse für: %s"
-#: ../../Zotlabs/Module/Pubstream.php:81
-#: ../../Zotlabs/Widget/Notifications.php:129
+#: ../../Zotlabs/Module/Pubstream.php:93
+#: ../../Zotlabs/Widget/Notifications.php:131
msgid "Public Stream"
msgstr "Öffentlicher Beitrags-Stream"
@@ -1048,7 +1053,7 @@ msgid "Menu Item Permissions"
msgstr "Zugriffsrechte des Menü-Elements"
#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:522
+#: ../../Zotlabs/Module/Settings/Channel.php:521
msgid "(click to open/close)"
msgstr "(zum öffnen/schließen anklicken)"
@@ -1072,17 +1077,17 @@ msgstr "Magic-Auth verwenden, falls verfügbar"
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:240
+#: ../../Zotlabs/Module/Admin/Site.php:252
#: ../../Zotlabs/Module/Settings/Channel.php:305
-#: ../../Zotlabs/Module/Settings/Display.php:105
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:697
+#: ../../Zotlabs/Module/Settings/Display.php:100
+#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779
#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
#: ../../Zotlabs/Module/Filestorage.php:155
#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
#: ../../view/theme/redbasic_c/php/config.php:100
#: ../../view/theme/redbasic_c/php/config.php:115
#: ../../view/theme/redbasic/php/config.php:98
@@ -1107,8 +1112,8 @@ msgstr "Magic-Auth verwenden, falls verfügbar"
#: ../../addon/statusnet/statusnet.php:389
#: ../../addon/statusnet/statusnet.php:411
#: ../../addon/statusnet/statusnet.php:415
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
-#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243
+#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
#: ../../addon/smileybutton/smileybutton.php:211
#: ../../addon/smileybutton/smileybutton.php:215
#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
@@ -1123,17 +1128,17 @@ msgstr "Nein"
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:242
+#: ../../Zotlabs/Module/Admin/Site.php:254
#: ../../Zotlabs/Module/Settings/Channel.php:305
-#: ../../Zotlabs/Module/Settings/Display.php:105
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:697
+#: ../../Zotlabs/Module/Settings/Display.php:100
+#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100
#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180
#: ../../Zotlabs/Module/Profiles.php:681
#: ../../Zotlabs/Module/Filestorage.php:155
#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:394 ../../boot.php:1669
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
#: ../../view/theme/redbasic_c/php/config.php:100
#: ../../view/theme/redbasic_c/php/config.php:115
#: ../../view/theme/redbasic/php/config.php:98
@@ -1158,8 +1163,8 @@ msgstr "Nein"
#: ../../addon/statusnet/statusnet.php:389
#: ../../addon/statusnet/statusnet.php:411
#: ../../addon/statusnet/statusnet.php:415
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242
-#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243
+#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
#: ../../addon/smileybutton/smileybutton.php:211
#: ../../addon/smileybutton/smileybutton.php:215
#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
@@ -1276,8 +1281,8 @@ msgid "Event not found."
msgstr "Termin nicht gefunden."
#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:384 ../../include/conversation.php:119
-#: ../../include/text.php:1941 ../../include/event.php:1153
+#: ../../Zotlabs/Module/Like.php:385 ../../include/conversation.php:119
+#: ../../include/text.php:2007 ../../include/event.php:1153
msgid "event"
msgstr "Termin"
@@ -1288,7 +1293,7 @@ msgstr "Termintitel bearbeiten"
#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141
#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
-#: ../../include/datetime.php:265
+#: ../../include/datetime.php:205
msgid "Required"
msgstr "Benötigt"
@@ -1339,7 +1344,7 @@ msgid "Edit Location"
msgstr "Ort bearbeiten"
#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:764
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:760
#: ../../include/conversation.php:1330
msgid "Preview"
msgstr "Vorschau"
@@ -1369,7 +1374,7 @@ msgid "Delete event"
msgstr "Termin löschen"
#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
-#: ../../include/text.php:1760
+#: ../../include/text.php:1826
msgid "Link to Source"
msgstr "Link zur Quelle"
@@ -1386,7 +1391,7 @@ msgid "Create Event"
msgstr "Termin anlegen"
#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
-#: ../../include/channel.php:1636
+#: ../../include/channel.php:1637
msgid "Export"
msgstr "Exportieren"
@@ -1459,16 +1464,16 @@ msgid "Hub not found."
msgstr "Server nicht gefunden."
#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:382
+#: ../../Zotlabs/Module/Like.php:383
#: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295
-#: ../../include/conversation.php:116 ../../include/text.php:1938
+#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359
+#: ../../include/conversation.php:116 ../../include/text.php:2004
msgid "photo"
msgstr "Foto"
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:382
-#: ../../addon/diaspora/Receiver.php:1433 ../../addon/pubcrawl/as.php:1295
-#: ../../include/conversation.php:144 ../../include/text.php:1944
+#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:383
+#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359
+#: ../../include/conversation.php:144 ../../include/text.php:2010
msgid "status"
msgstr "Status"
@@ -1545,66 +1550,70 @@ msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus ein
msgid "File to Upload"
msgstr "Hochzuladende Datei:"
-#: ../../Zotlabs/Module/New_channel.php:121
+#: ../../Zotlabs/Module/New_channel.php:119
#: ../../Zotlabs/Module/Manage.php:138
#, php-format
msgid "You have created %1$.0f of %2$.0f allowed channels."
msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
-#: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:249
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:254
msgid "Name or caption"
msgstr "Name oder Titel"
-#: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:249
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:254
msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
-#: ../../Zotlabs/Module/New_channel.php:136
-#: ../../Zotlabs/Module/Register.php:251
+#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/Register.php:256
msgid "Choose a short nickname"
msgstr "Wähle einen kurzen Spitznamen"
-#: ../../Zotlabs/Module/New_channel.php:136
-#: ../../Zotlabs/Module/Register.php:251
+#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/Register.php:256
#, php-format
msgid ""
"Your nickname will be used to create an easy to remember channel address "
"e.g. nickname%s"
msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/Register.php:257
msgid "Channel role and privacy"
msgstr "Kanaltyp und Privatspäre-Einstellungen"
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/Register.php:257
msgid "Select a channel role with your privacy requirements."
msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/Register.php:257
msgid "Read more about roles"
msgstr "Mehr Informationen über Rollen"
-#: ../../Zotlabs/Module/New_channel.php:140
+#: ../../Zotlabs/Module/New_channel.php:138
msgid "Create Channel"
msgstr "Einen neuen Kanal anlegen"
-#: ../../Zotlabs/Module/New_channel.php:141
+#: ../../Zotlabs/Module/New_channel.php:139
msgid ""
"A channel is your identity on this network. It can represent a person, a "
"blog, or a forum to name a few. Channels can make connections with other "
"channels to share information with highly detailed permissions."
msgstr "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."
-#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/New_channel.php:140
msgid ""
"or <a href=\"import\">import an existing channel</a> from another location."
msgstr "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server."
+#: ../../Zotlabs/Module/New_channel.php:145
+msgid "Validate"
+msgstr "Überprüfe"
+
#: ../../Zotlabs/Module/Removeme.php:35
msgid ""
"Channel removals are not allowed within 48 hours of changing the account "
@@ -1647,7 +1656,7 @@ msgid ""
msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Zotlabs/Module/Settings/Channel.php:592
msgid "Remove Channel"
msgstr "Kanal löschen"
@@ -1660,12 +1669,12 @@ msgid "NEW"
msgstr "NEU"
#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:282 ../../include/text.php:1394
+#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434
msgid "Size"
msgstr "Größe"
#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:283
+#: ../../Zotlabs/Storage/Browser.php:286
msgid "Last Modified"
msgstr "Zuletzt geändert"
@@ -1780,7 +1789,7 @@ msgstr "E-Mail Adresse des Seiten-Administrators"
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
-msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
+msgstr "Die E-Mail-Adresse Deines Kontos muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
msgid "Website URL"
@@ -2215,30 +2224,26 @@ msgstr "Zusätzliche Funktionen verwalten"
msgid "Update has been marked successful"
msgstr "Update wurde als erfolgreich markiert"
-#: ../../Zotlabs/Module/Admin/Dbsync.php:29
+#: ../../Zotlabs/Module/Admin/Dbsync.php:31
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#: ../../Zotlabs/Module/Admin/Dbsync.php:34
#, php-format
msgid "Update %s was successfully applied."
msgstr "Update %s wurde erfolgreich ausgeführt."
-#: ../../Zotlabs/Module/Admin/Dbsync.php:36
+#: ../../Zotlabs/Module/Admin/Dbsync.php:38
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#: ../../Zotlabs/Module/Admin/Dbsync.php:41
#, php-format
msgid "Update function %s could not be found."
msgstr "Update-Funktion %s konnte nicht gefunden werden."
-#: ../../Zotlabs/Module/Admin/Dbsync.php:55
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Aktualisierungen."
-
#: ../../Zotlabs/Module/Admin/Dbsync.php:59
msgid "Failed Updates"
msgstr "Fehlgeschlagene Aktualisierungen"
@@ -2251,12 +2256,16 @@ msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
msgid "Attempt to execute this update step automatically"
msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Aktualisierungen."
+
#: ../../Zotlabs/Module/Admin/Plugins.php:259
#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:408
+#: ../../Zotlabs/Module/Display.php:410
#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
-#: ../../include/items.php:3546
+#: ../../include/items.php:3569
msgid "Item not found."
msgstr "Element nicht gefunden."
@@ -2282,12 +2291,12 @@ msgstr "Aktivieren"
#: ../../Zotlabs/Module/Admin/Plugins.php:341
#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Accounts.php:165
#: ../../Zotlabs/Module/Admin/Logs.php:82
#: ../../Zotlabs/Module/Admin/Channels.php:145
#: ../../Zotlabs/Module/Admin/Themes.php:122
#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Zotlabs/Module/Admin/Site.php:287
#: ../../Zotlabs/Module/Admin/Security.php:86
#: ../../Zotlabs/Module/Admin.php:136
msgid "Administration"
@@ -2305,9 +2314,10 @@ msgid "Toggle"
msgstr "Umschalten"
#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:236
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:139
-#: ../../include/nav.php:224
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
+#: ../../Zotlabs/Widget/Newmember.php:55
+#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105
+#: ../../include/nav.php:192
msgid "Settings"
msgstr "Einstellungen"
@@ -2370,7 +2380,7 @@ msgstr "Plugin-Repository herunterladen"
msgid "Install new repo"
msgstr "Neues Repository installieren"
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:383
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393
msgid "Install"
msgstr "Installieren"
@@ -2396,112 +2406,112 @@ msgstr "Zweig/Branch wechseln"
msgid "Remove"
msgstr "Entfernen"
-#: ../../Zotlabs/Module/Admin/Accounts.php:36
+#: ../../Zotlabs/Module/Admin/Accounts.php:37
#, php-format
msgid "%s account blocked/unblocked"
msgid_plural "%s account blocked/unblocked"
msgstr[0] "%s Konto blockiert/freigegeben"
msgstr[1] "%s Konten blockiert/freigegeben"
-#: ../../Zotlabs/Module/Admin/Accounts.php:43
+#: ../../Zotlabs/Module/Admin/Accounts.php:44
#, php-format
msgid "%s account deleted"
msgid_plural "%s accounts deleted"
msgstr[0] "%s Konto gelöscht"
msgstr[1] "%s Konten gelöscht"
-#: ../../Zotlabs/Module/Admin/Accounts.php:79
+#: ../../Zotlabs/Module/Admin/Accounts.php:80
msgid "Account not found"
msgstr "Konto nicht gefunden"
-#: ../../Zotlabs/Module/Admin/Accounts.php:90 ../../include/channel.php:2456
+#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2462
#, php-format
msgid "Account '%s' deleted"
msgstr "Konto '%s' gelöscht"
-#: ../../Zotlabs/Module/Admin/Accounts.php:98
+#: ../../Zotlabs/Module/Admin/Accounts.php:99
#, php-format
msgid "Account '%s' blocked"
msgstr "Konto '%s' blockiert"
-#: ../../Zotlabs/Module/Admin/Accounts.php:106
+#: ../../Zotlabs/Module/Admin/Accounts.php:107
#, php-format
msgid "Account '%s' unblocked"
msgstr "Konto '%s' freigegeben"
-#: ../../Zotlabs/Module/Admin/Accounts.php:165
-#: ../../Zotlabs/Module/Admin/Accounts.php:178
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Zotlabs/Module/Admin/Accounts.php:179
#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
msgid "Accounts"
msgstr "Konten"
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Accounts.php:168
#: ../../Zotlabs/Module/Admin/Channels.php:148
msgid "select all"
msgstr "Alle auswählen"
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
msgid "Registrations waiting for confirm"
msgstr "Registrierungen warten auf Bestätigung"
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
msgid "Request date"
msgstr "Antragsdatum"
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
msgid "No registrations."
msgstr "Keine Registrierungen."
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Connections.php:282 ../../include/conversation.php:732
+#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Zotlabs/Module/Connections.php:287 ../../include/conversation.php:732
msgid "Approve"
msgstr "Genehmigen"
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Zotlabs/Module/Admin/Accounts.php:173
msgid "Deny"
msgstr "Verweigern"
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
#: ../../Zotlabs/Module/Connedit.php:622
msgid "Block"
msgstr "Blockieren"
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Admin/Accounts.php:176
#: ../../Zotlabs/Module/Connedit.php:622
msgid "Unblock"
msgstr "Freigeben"
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
msgid "ID"
msgstr "ID"
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:284
+#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:284
msgid "All Channels"
msgstr "Alle Kanäle"
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
+#: ../../Zotlabs/Module/Admin/Accounts.php:184
msgid "Register date"
msgstr "Registrierungs-Datum"
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Zotlabs/Module/Admin/Accounts.php:185
msgid "Last login"
msgstr "Letzte Anmeldung"
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Zotlabs/Module/Admin/Accounts.php:186
msgid "Expires"
msgstr "Verfällt"
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Zotlabs/Module/Admin/Accounts.php:187
msgid "Service Class"
msgstr "Service-Klasse"
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Zotlabs/Module/Admin/Accounts.php:189
msgid ""
"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
" on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
-#: ../../Zotlabs/Module/Admin/Accounts.php:189
+#: ../../Zotlabs/Module/Admin/Accounts.php:190
msgid ""
"The account {0} will be deleted!\\n\\nEverything this account has posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2610,7 +2620,7 @@ msgid "Disallow Code"
msgstr "Code sperren"
#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1808 ../../include/nav.php:410
+#: ../../include/conversation.php:1808 ../../include/nav.php:378
msgid "Channel"
msgstr "Kanal"
@@ -2655,415 +2665,472 @@ msgstr "[Experimentell]"
msgid "[Unsupported]"
msgstr "[Nicht unterstützt]"
-#: ../../Zotlabs/Module/Admin/Site.php:147
+#: ../../Zotlabs/Module/Admin/Site.php:158
msgid "Site settings updated."
msgstr "Site-Einstellungen aktualisiert."
-#: ../../Zotlabs/Module/Admin/Site.php:173
+#: ../../Zotlabs/Module/Admin/Site.php:184
#: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2968
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082
msgid "Default"
msgstr "Standard"
-#: ../../Zotlabs/Module/Admin/Site.php:184
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Zotlabs/Module/Admin/Site.php:195
+#: ../../Zotlabs/Module/Settings/Display.php:130
#, php-format
msgid "%s - (Incompatible)"
msgstr "%s - (Inkompatibel)"
-#: ../../Zotlabs/Module/Admin/Site.php:191
-#: ../../Zotlabs/Module/Settings/Display.php:153
+#: ../../Zotlabs/Module/Admin/Site.php:202
msgid "mobile"
msgstr "mobil"
-#: ../../Zotlabs/Module/Admin/Site.php:193
+#: ../../Zotlabs/Module/Admin/Site.php:204
msgid "experimental"
msgstr "experimentell"
-#: ../../Zotlabs/Module/Admin/Site.php:195
+#: ../../Zotlabs/Module/Admin/Site.php:206
msgid "unsupported"
msgstr "nicht unterstützt"
-#: ../../Zotlabs/Module/Admin/Site.php:241
+#: ../../Zotlabs/Module/Admin/Site.php:253
msgid "Yes - with approval"
msgstr "Ja - mit Zustimmung"
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:259
msgid "My site is not a public server"
msgstr "Mein Server ist kein öffentlicher Server"
-#: ../../Zotlabs/Module/Admin/Site.php:248
+#: ../../Zotlabs/Module/Admin/Site.php:260
msgid "My site has paid access only"
msgstr "Meine Seite hat nur bezahlten Zugriff"
-#: ../../Zotlabs/Module/Admin/Site.php:249
+#: ../../Zotlabs/Module/Admin/Site.php:261
msgid "My site has free access only"
msgstr "Meine Seite hat nur freien Zugriff"
-#: ../../Zotlabs/Module/Admin/Site.php:250
+#: ../../Zotlabs/Module/Admin/Site.php:262
msgid "My site offers free accounts with optional paid upgrades"
msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
-#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Admin/Site.php:274
msgid "Beginner/Basic"
msgstr "Anfänger/Basis"
-#: ../../Zotlabs/Module/Admin/Site.php:263
+#: ../../Zotlabs/Module/Admin/Site.php:275
msgid "Novice - not skilled but willing to learn"
msgstr "Anfänger - unerfahren, aber bereit zu lernen"
-#: ../../Zotlabs/Module/Admin/Site.php:264
+#: ../../Zotlabs/Module/Admin/Site.php:276
msgid "Intermediate - somewhat comfortable"
msgstr "Fortgeschritten - relativ komfortabel"
-#: ../../Zotlabs/Module/Admin/Site.php:265
+#: ../../Zotlabs/Module/Admin/Site.php:277
msgid "Advanced - very comfortable"
msgstr "Fortgeschritten - sehr komfortabel"
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Zotlabs/Module/Admin/Site.php:278
msgid "Expert - I can write computer code"
msgstr "Experte - Ich kann Computercode schreiben"
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Zotlabs/Module/Admin/Site.php:279
msgid "Wizard - I probably know more than you do"
msgstr "Zauberer - ich kann wahrscheinlich mehr als Du"
-#: ../../Zotlabs/Module/Admin/Site.php:276 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22
msgid "Site"
msgstr "Seite"
-#: ../../Zotlabs/Module/Admin/Site.php:278
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Zotlabs/Module/Register.php:269
msgid "Registration"
msgstr "Registrierung"
-#: ../../Zotlabs/Module/Admin/Site.php:279
+#: ../../Zotlabs/Module/Admin/Site.php:291
msgid "File upload"
msgstr "Dateiupload"
-#: ../../Zotlabs/Module/Admin/Site.php:280
+#: ../../Zotlabs/Module/Admin/Site.php:292
msgid "Policies"
msgstr "Richtlinien"
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Zotlabs/Module/Admin/Site.php:293
#: ../../include/contact_widgets.php:16
msgid "Advanced"
msgstr "Fortgeschritten"
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Zotlabs/Module/Admin/Site.php:297
#: ../../addon/statusnet/statusnet.php:891
msgid "Site name"
msgstr "Seitenname"
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:299
msgid "Site default technical skill level"
msgstr "Standard-Qualifikationsstufe der Website"
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:299
msgid "Used to provide a member experience matched to technical comfort level"
msgstr "Dies wird verwendet, um eine Benutzererfahrung passend zur technischen Qualifikationsstufe zu bieten."
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Admin/Site.php:301
msgid "Lock the technical skill level setting"
msgstr "Sperre die technische Qualifikationsstufe"
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Admin/Site.php:301
msgid "Members can set their own technical comfort level by default"
msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen"
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:303
msgid "Banner/Logo"
msgstr "Banner/Logo"
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid "Unfiltered HTML/CSS/JS is allowed"
+msgstr "Ungefiltertes HTML/CSS/JS ist erlaubt"
+
+#: ../../Zotlabs/Module/Admin/Site.php:304
msgid "Administrator Information"
msgstr "Administrator-Informationen"
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Admin/Site.php:304
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
-#: ../../Zotlabs/Module/Admin/Site.php:293
-#: ../../Zotlabs/Module/Siteinfo.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Siteinfo.php:21
msgid "Site Information"
msgstr "Seiteninformationen"
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:305
msgid ""
"Publicly visible description of this site. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden."
-#: ../../Zotlabs/Module/Admin/Site.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:306
msgid "System language"
msgstr "System-Sprache"
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:307
msgid "System theme"
msgstr "System-Design"
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:307
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Standard-System-Design – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Design-Einstellungen ändern</a>"
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:308
msgid "Mobile system theme"
msgstr "System-Design für mobile Geräte:"
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:308
msgid "Theme for mobile devices"
msgstr "Theme für mobile Geräte"
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:310
msgid "Allow Feeds as Connections"
msgstr "Feeds als Verbindungen erlauben"
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:310
msgid "(Heavy system resource usage)"
msgstr "(führt zu hoher Systemlast)"
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:311
msgid "Maximum image size"
msgstr "Maximale Bildgröße"
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:311
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:312
msgid "Does this site allow new member registration?"
msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:313
msgid "Invitation only"
msgstr "Nur mit Einladung"
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:313
msgid ""
"Only allow new member registrations with an invitation code. Above register "
"policy must be set to Yes."
msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid "Minimum age"
+msgstr "Mindestalter"
+
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid "Minimum age (in years) for who may register on this site."
+msgstr "Mindestalter (in Jahren) für alle, die sich auf dieser Website anmelden möchten."
+
+#: ../../Zotlabs/Module/Admin/Site.php:315
msgid "Which best describes the types of account offered by this hub?"
msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:316
msgid "Register text"
msgstr "Registrierungstext"
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:316
msgid "Will be displayed prominently on the registration page."
msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:317
msgid "Site homepage to show visitors (default: login box)"
msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:317
msgid ""
"example: 'public' to show public stream, 'page/sys/home' to show a system "
"webpage called 'home' or 'include:home.html' to include a file."
msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:318
msgid "Preserve site homepage URL"
msgstr "Homepage-URL schützen"
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:318
msgid ""
"Present the site homepage in a frame at the original location instead of "
"redirecting"
msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:319
msgid "Accounts abandoned after x days"
msgstr "Konten gelten nach X Tagen als unbenutzt"
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:319
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid "Allowed friend domains"
msgstr "Erlaubte Domains für Kontakte"
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid "Verify Email Addresses"
msgstr "E-Mail-Adressen überprüfen"
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:322
msgid "Force publish"
msgstr "Veröffentlichung erzwingen"
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:322
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:323
msgid "Import Public Streams"
msgstr "Öffentliche Beiträge importieren"
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:323
msgid ""
"Import and allow access to public content pulled from other sites. Warning: "
"this content is unmoderated."
msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:324
+msgid "Site only Public Streams"
+msgstr "Öffentlichen Beitragsstrom auf diesen Server beschränken"
+
+#: ../../Zotlabs/Module/Admin/Site.php:324
+msgid ""
+"Allow access to public content originating only from this site if Imported "
+"Public Streams are disabled."
+msgstr "Erlaubt den Zugriff auf öffentliche Beiträge von ausschließlich dieser Website (diesem Server), wenn \"Öffentliche Beiträge importieren\" ausgeschaltet ist."
+
+#: ../../Zotlabs/Module/Admin/Site.php:325
+msgid "Allow anybody on the internet to access the Public streams"
+msgstr "Allen im Internet Zugriff auf den öffentlichen Beitragsstrom erlauben"
+
+#: ../../Zotlabs/Module/Admin/Site.php:325
+msgid ""
+"Disable to require authentication before viewing. Warning: this content is "
+"unmoderated."
+msgstr "Deaktiviert die erforderliche Authentifizierung vor dem Ansehen. Warnung: Diese Inhalte sind nicht moderiert."
+
+#: ../../Zotlabs/Module/Admin/Site.php:326
msgid "Login on Homepage"
msgstr "Log-in auf der Startseite"
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:326
msgid ""
"Present a login box to visitors on the home page if no other content has "
"been configured."
msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:327
msgid "Enable context help"
msgstr "Kontext-Hilfe aktivieren"
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:327
msgid ""
"Display contextual help for the current page when the help button is "
"pressed."
msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:329
msgid "Reply-to email address for system generated email."
msgstr "Antwortadresse (reply-to) für Emails, die vom System generiert wurden."
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:330
msgid "Sender (From) email address for system generated email."
msgstr "Absenderadresse (from) für Emails, die vom System generiert wurden."
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:331
msgid "Name of email sender for system generated email."
msgstr "Name des Versenders von Emails, die vom System generiert wurden."
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:333
msgid "Directory Server URL"
msgstr "Verzeichnisserver-URL"
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:333
msgid "Default directory server"
msgstr "Standard-Verzeichnisserver"
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:335
msgid "Proxy user"
msgstr "Proxy Benutzer"
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Admin/Site.php:336
msgid "Proxy URL"
msgstr "Proxy URL"
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:337
msgid "Network timeout"
msgstr "Netzwerk-Timeout"
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:337
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:338
msgid "Delivery interval"
msgstr "Auslieferung Intervall"
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:338
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:339
msgid "Deliveries per process"
msgstr "Zustellungen pro Prozess"
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:339
msgid ""
"Number of deliveries to attempt in a single operating system process. Adjust"
" if necessary to tune system performance. Recommend: 1-5."
msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:340
msgid "Queue Threshold"
msgstr "Warteschlangen-Grenzwert"
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:340
msgid ""
"Always defer immediate delivery if queue contains more than this number of "
"entries."
msgstr "Unmittelbare Zustellung immer verzögern, wenn die Warteschlange mehr als diese Anzahl von Einträgen enthält."
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:341
msgid "Poll interval"
msgstr "Abfrageintervall"
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:341
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:342
msgid "Path to ImageMagick convert program"
msgstr "Pfad zum ImageMagick-Programm convert"
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:342
msgid ""
"If set, use this program to generate photo thumbnails for huge images ( > "
"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
"Example: /usr/bin/convert"
msgstr "Wenn gesetzt, dann verwende dieses Programm zum Erzeugen von Vorschaubildern großer Fotos (>4000 Pixel in beiden Richtungen), anderenfalls kann Speicherüberlauf auftreten. Beispiel: /usr/bin/convert"
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:343
msgid "Allow SVG thumbnails in file browser"
msgstr "Erlaube SVG-Vorschaubilder im Dateibrowser"
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:343
msgid "WARNING: SVG images may contain malicious code."
msgstr "Warnung: SVG-Grafiken können Schadcode enthalten."
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:344
msgid "Maximum Load Average"
msgstr "Maximales Load Average"
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:344
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:345
msgid "Expiration period in days for imported (grid/network) content"
msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:345
msgid "0 for no expiration of imported content"
msgstr "0 = keine Löschung importierter Inhalte"
+#: ../../Zotlabs/Module/Admin/Site.php:347
+msgid ""
+"Public servers: Optional landing (marketing) webpage for new registrants"
+msgstr "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung"
+
+#: ../../Zotlabs/Module/Admin/Site.php:347
+#, php-format
+msgid "Create this page first. Default is %s/register"
+msgstr "Erstelle zunächst die entsprechende Seite. Standard ist %s/register"
+
+#: ../../Zotlabs/Module/Admin/Site.php:348
+msgid "Page to display after creating a new channel"
+msgstr "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll"
+
+#: ../../Zotlabs/Module/Admin/Site.php:348
+msgid "Recommend: profiles, go, or settings"
+msgstr "Empfohlen: profiles, go oder settings"
+
+#: ../../Zotlabs/Module/Admin/Site.php:350
+msgid "Optional: site location"
+msgstr "Optional: Standort der Website"
+
+#: ../../Zotlabs/Module/Admin/Site.php:350
+msgid "Region or country"
+msgstr "Region oder Land"
+
#: ../../Zotlabs/Module/Admin/Profs.php:69
msgid "New Profile Field"
msgstr "Neues Profilfeld"
@@ -3106,8 +3173,8 @@ msgstr "Zusätzliche Informationen (optional)"
#: ../../Zotlabs/Module/Admin/Profs.php:74
#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1030
-#: ../../include/text.php:1042
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052
+#: ../../include/text.php:1064
msgid "Save"
msgstr "Speichern"
@@ -3306,7 +3373,7 @@ msgid "Visible to:"
msgstr "Sichtbar für:"
#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:118 ../../include/acl_selectors.php:183
+#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88
msgctxt "acl"
msgid "Profile"
msgstr "Profil"
@@ -3339,25 +3406,25 @@ msgstr "Name der Berechtigungsrolle"
#: ../../Zotlabs/Module/Settings/Permcats.php:103
#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Defperms.php:250
+#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
msgid "My Settings"
msgstr "Meine Einstellungen"
#: ../../Zotlabs/Module/Settings/Permcats.php:105
#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:903 ../../Zotlabs/Module/Defperms.php:248
+#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
msgid "inherited"
msgstr "geerbt"
#: ../../Zotlabs/Module/Settings/Permcats.php:108
#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Defperms.php:253
+#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
msgid "Individual Permissions"
msgstr "Individuelle Zugriffsrechte"
#: ../../Zotlabs/Module/Settings/Permcats.php:109
#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:911
+#: ../../Zotlabs/Module/Connedit.php:894
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -3370,7 +3437,7 @@ msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"
#: ../../Zotlabs/Module/Settings/Channel.php:69
#: ../../Zotlabs/Module/Settings/Channel.php:72
#: ../../Zotlabs/Module/Settings/Channel.php:83
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:28
+#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
#: ../../include/selectors.php:123 ../../include/channel.php:437
#: ../../include/channel.php:438 ../../include/channel.php:445
msgid "Friends"
@@ -3381,7 +3448,7 @@ msgstr "Freunde"
#: ../../addon/rendezvous/rendezvous.php:82
#: ../../addon/openstreetmap/openstreetmap.php:184
#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
-#: ../../addon/twitter/twitter.php:766 ../../addon/piwik/piwik.php:116
+#: ../../addon/twitter/twitter.php:772 ../../addon/piwik/piwik.php:116
#: ../../addon/xmpp/xmpp.php:102
msgid "Settings updated."
msgstr "Einstellungen aktualisiert."
@@ -3418,371 +3485,370 @@ msgstr "Jeder authentifizierte"
msgid "Anybody on the internet"
msgstr "Jeder im Internet"
-#: ../../Zotlabs/Module/Settings/Channel.php:406
+#: ../../Zotlabs/Module/Settings/Channel.php:405
msgid "Publish your default profile in the network directory"
msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
-#: ../../Zotlabs/Module/Settings/Channel.php:411
+#: ../../Zotlabs/Module/Settings/Channel.php:410
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
-#: ../../Zotlabs/Module/Settings/Channel.php:415
-#: ../../Zotlabs/Module/Profile_photo.php:443
-#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Settings/Channel.php:414
msgid "or"
msgstr "oder"
-#: ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Zotlabs/Module/Settings/Channel.php:419
msgid "Your channel address is"
msgstr "Deine Kanal-Adresse lautet"
-#: ../../Zotlabs/Module/Settings/Channel.php:423
+#: ../../Zotlabs/Module/Settings/Channel.php:422
msgid "Your files/photos are accessible via WebDAV at"
msgstr "Deine Dateien/Fotos sind via WebDAV verfügbar auf"
-#: ../../Zotlabs/Module/Settings/Channel.php:487
+#: ../../Zotlabs/Module/Settings/Channel.php:486
msgid "Channel Settings"
msgstr "Kanal-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:494
+#: ../../Zotlabs/Module/Settings/Channel.php:493
msgid "Basic Settings"
msgstr "Grundeinstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../include/channel.php:1521
+#: ../../Zotlabs/Module/Settings/Channel.php:494
+#: ../../include/channel.php:1522
msgid "Full Name:"
msgstr "Voller Name:"
-#: ../../Zotlabs/Module/Settings/Channel.php:496
+#: ../../Zotlabs/Module/Settings/Channel.php:495
#: ../../Zotlabs/Module/Settings/Account.php:119
msgid "Email Address:"
msgstr "Email Adresse:"
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:496
msgid "Your Timezone:"
msgstr "Ihre Zeitzone:"
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:497
msgid "Default Post Location:"
msgstr "Standardstandort:"
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:497
msgid "Geographical location to display on your posts"
msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Settings/Channel.php:498
msgid "Use Browser Location:"
msgstr "Standort des Browsers verwenden:"
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Zotlabs/Module/Settings/Channel.php:500
msgid "Adult Content"
msgstr "Nicht jugendfreie Inhalte"
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Zotlabs/Module/Settings/Channel.php:500
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Zotlabs/Module/Settings/Channel.php:502
msgid "Security and Privacy Settings"
msgstr "Sicherheits- und Datenschutz-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Zotlabs/Module/Settings/Channel.php:504
msgid "Your permissions are already configured. Click to view/adjust"
msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "Hide my online presence"
msgstr "Meine Online-Präsenz verbergen"
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Zotlabs/Module/Settings/Channel.php:506
msgid "Prevents displaying in your profile that you are online"
msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:508
msgid "Simple Privacy Settings:"
msgstr "Einfache Privatsphäre-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:509
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:510
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:512
+#: ../../Zotlabs/Module/Settings/Channel.php:511
msgid "Private - <em>default private, never open or public</em>"
msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Zotlabs/Module/Settings/Channel.php:512
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Zotlabs/Module/Settings/Channel.php:514
msgid "Allow others to tag your posts"
msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Zotlabs/Module/Settings/Channel.php:514
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../Zotlabs/Module/Settings/Channel.php:516
msgid "Channel Permission Limits"
msgstr "Kanal-Berechtigungslimits"
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "Expire other channel content after this many days"
msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "0 or blank to use the website limit."
msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
#, php-format
msgid "This website expires after %d days."
msgstr "Diese Webseite läuft nach %d Tagen ab."
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "This website does not expire imported content."
msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "The website limit takes precedence if lower than your limit."
msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
-#: ../../Zotlabs/Module/Settings/Channel.php:520
+#: ../../Zotlabs/Module/Settings/Channel.php:519
msgid "Maximum Friend Requests/Day:"
msgstr "Maximale Kontaktanfragen pro Tag:"
-#: ../../Zotlabs/Module/Settings/Channel.php:520
+#: ../../Zotlabs/Module/Settings/Channel.php:519
msgid "May reduce spam activity"
msgstr "Kann die Spam-Aktivität verringern"
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Zotlabs/Module/Settings/Channel.php:520
msgid "Default Privacy Group"
msgstr "Standard-Gruppe"
-#: ../../Zotlabs/Module/Settings/Channel.php:523
+#: ../../Zotlabs/Module/Settings/Channel.php:522
msgid "Use my default audience setting for the type of object published"
msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
-#: ../../Zotlabs/Module/Settings/Channel.php:524
+#: ../../Zotlabs/Module/Settings/Channel.php:523
msgid "Profile to assign new connections"
msgstr "Profil, welches neuen Verbindungen zugewiesen wird"
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:532
msgid "Channel permissions category:"
msgstr "Zugriffsrechte-Kategorie des Kanals:"
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Zotlabs/Module/Settings/Channel.php:533
msgid "Default Permissions Group"
msgstr "Standard-Berechtigungsgruppe"
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:539
msgid "Maximum private messages per day from unknown people:"
msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Zotlabs/Module/Settings/Channel.php:539
msgid "Useful to reduce spamming"
msgstr "Nützlich, um Spam zu verringern"
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Zotlabs/Lib/Enotify.php:68
msgid "Notification Settings"
msgstr "Benachrichtigungs-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Zotlabs/Module/Settings/Channel.php:543
msgid "By default post a status message when:"
msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
-#: ../../Zotlabs/Module/Settings/Channel.php:545
+#: ../../Zotlabs/Module/Settings/Channel.php:544
msgid "accepting a friend request"
msgstr "Du eine Verbindungsanfrage annimmst"
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:545
msgid "joining a forum/community"
msgstr "Du einem Forum beitrittst"
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:546
msgid "making an <em>interesting</em> profile change"
msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:547
msgid "Send a notification email when:"
msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:548
msgid "You receive a connection request"
msgstr "Du eine Verbindungsanfrage erhältst"
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:549
msgid "Your connections are confirmed"
msgstr "Eine Verbindung bestätigt wurde"
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:550
msgid "Someone writes on your profile wall"
msgstr "Jemand auf Deine Pinnwand schreibt"
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:551
msgid "Someone writes a followup comment"
msgstr "Jemand einen Beitrag kommentiert"
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:552
msgid "You receive a private message"
msgstr "Du eine private Nachricht erhältst"
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:553
msgid "You receive a friend suggestion"
msgstr "Du einen Kontaktvorschlag erhältst"
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:554
msgid "You are tagged in a post"
msgstr "Du in einem Beitrag erwähnt wurdest"
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:555
msgid "You are poked/prodded/etc. in a post"
msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:557
msgid "Someone likes your post/comment"
msgstr "Jemand mag Ihren Beitrag/Kommentar"
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Zotlabs/Module/Settings/Channel.php:560
msgid "Show visual notifications including:"
msgstr "Visuelle Benachrichtigungen anzeigen für:"
-#: ../../Zotlabs/Module/Settings/Channel.php:563
+#: ../../Zotlabs/Module/Settings/Channel.php:562
msgid "Unseen grid activity"
msgstr "Ungesehene Netzwerk-Aktivität"
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Zotlabs/Module/Settings/Channel.php:563
msgid "Unseen channel activity"
msgstr "Ungesehene Kanal-Aktivität"
-#: ../../Zotlabs/Module/Settings/Channel.php:565
+#: ../../Zotlabs/Module/Settings/Channel.php:564
msgid "Unseen private messages"
msgstr "Ungelesene persönliche Nachrichten"
-#: ../../Zotlabs/Module/Settings/Channel.php:565
+#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Zotlabs/Module/Settings/Channel.php:569
#: ../../Zotlabs/Module/Settings/Channel.php:570
#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
#: ../../addon/jappixmini/jappixmini.php:343
msgid "Recommended"
msgstr "Empfohlen"
-#: ../../Zotlabs/Module/Settings/Channel.php:566
+#: ../../Zotlabs/Module/Settings/Channel.php:565
msgid "Upcoming events"
msgstr "Baldige Termine"
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:566
msgid "Events today"
msgstr "Heutige Termine"
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:567
msgid "Upcoming birthdays"
msgstr "Baldige Geburtstage"
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:567
msgid "Not available in all themes"
msgstr "Nicht in allen Designs verfügbar"
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:568
msgid "System (personal) notifications"
msgstr "System – (persönliche) Benachrichtigungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:569
msgid "System info messages"
msgstr "System – Info-Nachrichten"
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:570
msgid "System critical alerts"
msgstr "System – kritische Warnungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:571
msgid "New connections"
msgstr "Neue Verbindungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:572
msgid "System Registrations"
msgstr "System – Registrierungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:573
msgid "Unseen shared files"
msgstr "Ungesehene geteilte Dateien"
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:574
msgid "Unseen public activity"
msgstr "Ungesehene öffentliche Aktivität"
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:575
msgid "Email notification hub (hostname)"
msgstr "Hub für E-Mail-Benachrichtigungen (Hostname)"
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:575
#, php-format
msgid ""
"If your channel is mirrored to multiple hubs, set this to your preferred "
"location. This will prevent duplicate email notifications. Example: %s"
msgstr "Wenn Dein Kanal auf mehreren Hubs geklont ist, setze die Einstellung auf deinen bevorzugten Hub. Dies verhindert Mehrfachzustellung von E-Mail-Benachrichtigungen. Beispiel: %s"
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:576
msgid ""
"Also show new wall posts, private messages and connections under Notices"
msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Zotlabs/Module/Settings/Channel.php:578
msgid "Notify me of events this many days in advance"
msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Zotlabs/Module/Settings/Channel.php:578
msgid "Must be greater than 0"
msgstr "Muss größer als 0 sein"
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:584
msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account- und Seitenart-Einstellungen"
+msgstr "Erweiterte Konten- und Seitenart-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Zotlabs/Module/Settings/Channel.php:585
msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+msgstr "Ändere das Verhalten dieses Kontos unter speziellen Umständen"
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Zotlabs/Module/Settings/Channel.php:587
msgid "Miscellaneous Settings"
msgstr "Sonstige Einstellungen"
-#: ../../Zotlabs/Module/Settings/Channel.php:589
+#: ../../Zotlabs/Module/Settings/Channel.php:588
msgid "Default photo upload folder"
msgstr "Voreingestellter Ordner für hochgeladene Fotos"
+#: ../../Zotlabs/Module/Settings/Channel.php:588
#: ../../Zotlabs/Module/Settings/Channel.php:589
-#: ../../Zotlabs/Module/Settings/Channel.php:590
msgid "%Y - current year, %m - current month"
msgstr "%Y - aktuelles Jahr, %m - aktueller Monat"
-#: ../../Zotlabs/Module/Settings/Channel.php:590
+#: ../../Zotlabs/Module/Settings/Channel.php:589
msgid "Default file upload folder"
msgstr "Voreingestellter Ordner für hochgeladene Dateien"
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Zotlabs/Module/Settings/Channel.php:591
msgid "Personal menu to display in your channel pages"
msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Zotlabs/Module/Settings/Channel.php:593
msgid "Remove this channel."
msgstr "Diesen Kanal löschen"
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:594
msgid "Firefox Share $Projectname provider"
msgstr "$Projectname-Provider für Firefox Share"
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Zotlabs/Module/Settings/Channel.php:595
msgid "Start calendar week on Monday"
msgstr "Beginne die kalendarische Woche am Montag"
@@ -3835,7 +3901,7 @@ msgid "Expires (yyyy-mm-dd)"
msgstr "Läuft ab (jjjj-mm-tt)"
#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:907
+#: ../../Zotlabs/Module/Connedit.php:890
msgid "Their Settings"
msgstr "Deren Einstellungen"
@@ -3900,8 +3966,10 @@ msgid "Your technical skill level"
msgstr "Deine technische Qualifikationsstufe"
#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Used to provide a member experience matched to your comfort level"
-msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung passend zu Deiner technischen Qualifikationsstufe zu bieten."
+msgid ""
+"Used to provide a member experience and additional features consistent with "
+"your comfort level"
+msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)."
#: ../../Zotlabs/Module/Settings/Account.php:120
#: ../../Zotlabs/Module/Removeaccount.php:61
@@ -3912,148 +3980,152 @@ msgstr "Konto entfernen"
msgid "Remove this account including all its channels"
msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
-#: ../../Zotlabs/Module/Settings/Featured.php:21
+#: ../../Zotlabs/Module/Settings/Featured.php:23
msgid "Affinity Slider settings updated."
msgstr "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."
-#: ../../Zotlabs/Module/Settings/Featured.php:36
+#: ../../Zotlabs/Module/Settings/Featured.php:38
msgid "No feature settings configured"
msgstr "Keine Funktions-Einstellungen konfiguriert"
-#: ../../Zotlabs/Module/Settings/Featured.php:43
+#: ../../Zotlabs/Module/Settings/Featured.php:45
msgid "Default maximum affinity level"
msgstr "Voreinstellung für maximalen Beziehungsgrad"
-#: ../../Zotlabs/Module/Settings/Featured.php:48
+#: ../../Zotlabs/Module/Settings/Featured.php:45
+msgid "0-99 default 99"
+msgstr "0-99 - Standard 99"
+
+#: ../../Zotlabs/Module/Settings/Featured.php:50
msgid "Default minimum affinity level"
msgstr "Voreinstellung für minimalen Beziehungsgrad"
-#: ../../Zotlabs/Module/Settings/Featured.php:52
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+msgid "0-99 - default 0"
+msgstr "0-99 - Standard 0"
+
+#: ../../Zotlabs/Module/Settings/Featured.php:54
msgid "Affinity Slider Settings"
msgstr "Beziehungsgrad-Schieberegler-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Featured.php:62
-msgid "Feature/Addon Settings"
-msgstr "Funktions-/Addon-Einstellungen"
+#: ../../Zotlabs/Module/Settings/Featured.php:64
+msgid "Addon Settings"
+msgstr "Addon-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Display.php:147
-msgid "No special theme for mobile devices"
-msgstr "Kein spezielles Design für mobile Geräte"
+#: ../../Zotlabs/Module/Settings/Featured.php:65
+msgid "Please save/submit changes to any panel before opening another."
+msgstr "Bitte speichere alle Änderungen in diesem Bereich, bevor Du einen anderen öffnest."
-#: ../../Zotlabs/Module/Settings/Display.php:150
+#: ../../Zotlabs/Module/Settings/Display.php:139
#, php-format
msgid "%s - (Experimental)"
msgstr "%s – (experimentell)"
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Zotlabs/Module/Settings/Display.php:187
msgid "Display Settings"
msgstr "Anzeige-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Zotlabs/Module/Settings/Display.php:188
msgid "Theme Settings"
msgstr "Design-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Zotlabs/Module/Settings/Display.php:189
msgid "Custom Theme Settings"
msgstr "Benutzerdefinierte Design-Einstellungen"
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Zotlabs/Module/Settings/Display.php:190
msgid "Content Settings"
msgstr "Inhaltseinstellungen"
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Zotlabs/Module/Settings/Display.php:196
msgid "Display Theme:"
msgstr "Anzeige-Design:"
-#: ../../Zotlabs/Module/Settings/Display.php:214
+#: ../../Zotlabs/Module/Settings/Display.php:197
msgid "Select scheme"
msgstr "Schema wählen"
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Mobile Theme:"
-msgstr "Design für mobile Geräte:"
-
-#: ../../Zotlabs/Module/Settings/Display.php:217
+#: ../../Zotlabs/Module/Settings/Display.php:199
msgid "Preload images before rendering the page"
msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
-#: ../../Zotlabs/Module/Settings/Display.php:217
+#: ../../Zotlabs/Module/Settings/Display.php:199
msgid ""
"The subjective page load time will be longer but the page will be ready when"
" displayed"
msgstr "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird"
-#: ../../Zotlabs/Module/Settings/Display.php:218
+#: ../../Zotlabs/Module/Settings/Display.php:200
msgid "Enable user zoom on mobile devices"
msgstr "Zoom auf Mobilgeräten aktivieren"
-#: ../../Zotlabs/Module/Settings/Display.php:219
+#: ../../Zotlabs/Module/Settings/Display.php:201
msgid "Update browser every xx seconds"
msgstr "Browser alle xx Sekunden aktualisieren"
-#: ../../Zotlabs/Module/Settings/Display.php:219
+#: ../../Zotlabs/Module/Settings/Display.php:201
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimum 10 Sekunden, kein Maximum"
-#: ../../Zotlabs/Module/Settings/Display.php:220
+#: ../../Zotlabs/Module/Settings/Display.php:202
msgid "Maximum number of conversations to load at any time:"
msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
-#: ../../Zotlabs/Module/Settings/Display.php:220
+#: ../../Zotlabs/Module/Settings/Display.php:202
msgid "Maximum of 100 items"
msgstr "Maximum: 100 Beiträge"
-#: ../../Zotlabs/Module/Settings/Display.php:221
+#: ../../Zotlabs/Module/Settings/Display.php:203
msgid "Show emoticons (smilies) as images"
msgstr "Emoticons (Smilies) als Bilder anzeigen"
-#: ../../Zotlabs/Module/Settings/Display.php:222
+#: ../../Zotlabs/Module/Settings/Display.php:204
msgid "Provide channel menu in navigation bar"
msgstr "Kanal-Menü in der Navigationsleiste zur Verfügung stellen"
-#: ../../Zotlabs/Module/Settings/Display.php:222
+#: ../../Zotlabs/Module/Settings/Display.php:204
msgid "Default: channel menu located in app menu"
msgstr "Voreinstellung: Kanal-Menü ist im App-Menü integriert"
-#: ../../Zotlabs/Module/Settings/Display.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:205
msgid "Manual conversation updates"
msgstr "Manuelle Konversationsaktualisierung"
-#: ../../Zotlabs/Module/Settings/Display.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:205
msgid "Default is on, turning this off may increase screen jumping"
msgstr "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen."
-#: ../../Zotlabs/Module/Settings/Display.php:224
+#: ../../Zotlabs/Module/Settings/Display.php:206
msgid "Link post titles to source"
msgstr "Beitragstitel zum Originalbeitrag verlinken"
-#: ../../Zotlabs/Module/Settings/Display.php:225
+#: ../../Zotlabs/Module/Settings/Display.php:207
msgid "System Page Layout Editor - (advanced)"
msgstr "System-Seitenlayout-Editor (für Experten)"
-#: ../../Zotlabs/Module/Settings/Display.php:228
+#: ../../Zotlabs/Module/Settings/Display.php:210
msgid "Use blog/list mode on channel page"
msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
-#: ../../Zotlabs/Module/Settings/Display.php:228
-#: ../../Zotlabs/Module/Settings/Display.php:229
+#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Zotlabs/Module/Settings/Display.php:211
msgid "(comments displayed separately)"
msgstr "(Kommentare werden separat angezeigt)"
-#: ../../Zotlabs/Module/Settings/Display.php:229
+#: ../../Zotlabs/Module/Settings/Display.php:211
msgid "Use blog/list mode on grid page"
msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
-#: ../../Zotlabs/Module/Settings/Display.php:230
+#: ../../Zotlabs/Module/Settings/Display.php:212
msgid "Channel page max height of content (in pixels)"
msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
-#: ../../Zotlabs/Module/Settings/Display.php:230
-#: ../../Zotlabs/Module/Settings/Display.php:231
+#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Zotlabs/Module/Settings/Display.php:213
msgid "click to expand content exceeding this height"
msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
-#: ../../Zotlabs/Module/Settings/Display.php:231
+#: ../../Zotlabs/Module/Settings/Display.php:213
msgid "Grid page max height of content (in pixels)"
msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
@@ -4077,7 +4149,7 @@ msgstr "Name der Anwendung"
#: ../../Zotlabs/Module/Settings/Oauth.php:90
#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:775
+#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
msgid "Consumer Key"
msgstr "Consumer Key"
@@ -4088,7 +4160,7 @@ msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
#: ../../Zotlabs/Module/Settings/Oauth.php:91
#: ../../Zotlabs/Module/Settings/Oauth.php:117
-#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:776
+#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
msgid "Consumer Secret"
msgstr "Consumer Secret"
@@ -4148,9 +4220,9 @@ msgstr "Album bearbeiten"
#: ../../Zotlabs/Module/Embedphotos.php:158
#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Photos.php:844
#: ../../Zotlabs/Module/Photos.php:1381
-#: ../../Zotlabs/Module/Profile_photo.php:437
+#: ../../Zotlabs/Module/Profile_photo.php:458
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:274 ../../Zotlabs/Storage/Browser.php:381
+#: ../../Zotlabs/Storage/Browser.php:277 ../../Zotlabs/Storage/Browser.php:384
#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169
#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97
msgid "Upload"
@@ -4217,7 +4289,7 @@ msgstr "URL eines Fotos der Sache (optional)"
#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071
#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
#: ../../Zotlabs/Module/Filestorage.php:147
-#: ../../include/acl_selectors.php:218
+#: ../../include/acl_selectors.php:123
msgid "Permissions"
msgstr "Berechtigungen"
@@ -4314,16 +4386,16 @@ msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur
msgid "Authentication failed."
msgstr "Authentifizierung fehlgeschlagen."
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1665
-#: ../../include/channel.php:2301
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583
+#: ../../include/channel.php:2307
msgid "Remote Authentication"
msgstr "Entfernte Authentifizierung"
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2302
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2308
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2303
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2309
msgid "Authenticate"
msgstr "Authentifizieren"
@@ -4331,23 +4403,23 @@ msgstr "Authentifizieren"
msgid "Permissions denied."
msgstr "Berechtigung verweigert."
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2312
+#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426
msgid "Import"
msgstr "Import"
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
msgid "Authorize application connection"
msgstr "Zugriff für die Anwendung autorisieren"
-#: ../../Zotlabs/Module/Api.php:73
+#: ../../Zotlabs/Module/Api.php:75
msgid "Return to your app and insert this Security Code:"
msgstr "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:"
-#: ../../Zotlabs/Module/Api.php:83
+#: ../../Zotlabs/Module/Api.php:85
msgid "Please login to continue."
msgstr "Zum Weitermachen, bitte einloggen."
-#: ../../Zotlabs/Module/Api.php:95
+#: ../../Zotlabs/Module/Api.php:97
msgid ""
"Do you want to authorize this application to access your posts and contacts,"
" and/or create new posts for you?"
@@ -4365,15 +4437,15 @@ msgstr "Block bearbeiten"
msgid "vcard"
msgstr "VCard"
-#: ../../Zotlabs/Module/Apps.php:47 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228
msgid "Apps"
msgstr "Apps"
-#: ../../Zotlabs/Module/Apps.php:50
+#: ../../Zotlabs/Module/Apps.php:51
msgid "Manage apps"
msgstr "Apps verwalten"
-#: ../../Zotlabs/Module/Apps.php:51
+#: ../../Zotlabs/Module/Apps.php:52
msgid "Create new app"
msgstr "Neue App erstellen"
@@ -4383,7 +4455,7 @@ msgctxt "mood"
msgid "%1$s is %2$s"
msgstr "%1$s ist %2$s"
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:247
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253
msgid "Mood"
msgstr "Laune"
@@ -4423,12 +4495,12 @@ msgstr "Neu"
#: ../../Zotlabs/Module/Connections.php:88
#: ../../Zotlabs/Module/Connections.php:102
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:30
+#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
msgid "All"
msgstr "Alle"
#: ../../Zotlabs/Module/Connections.php:133
-#: ../../Zotlabs/Widget/Notifications.php:82
+#: ../../Zotlabs/Widget/Notifications.php:84
msgid "New Connections"
msgstr "Neue Verbindungen"
@@ -4468,70 +4540,70 @@ msgstr "Archiviert"
msgid "Not connected at this location"
msgstr "An diesem Ort nicht verbunden"
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Zotlabs/Module/Connections.php:263
#, php-format
msgid "%1$s [%2$s]"
msgstr "%1$s [%2$s]"
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Zotlabs/Module/Connections.php:264
msgid "Edit connection"
msgstr "Verbindung bearbeiten"
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Zotlabs/Module/Connections.php:266
msgid "Delete connection"
msgstr "Verbindung löschen"
-#: ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Connections.php:275
msgid "Channel address"
msgstr "Kanaladresse"
-#: ../../Zotlabs/Module/Connections.php:272
+#: ../../Zotlabs/Module/Connections.php:277
msgid "Network"
msgstr "Netzwerk"
-#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Connections.php:280
msgid "Call"
msgstr "Anruf"
-#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Connections.php:282
msgid "Status"
msgstr "Status"
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Zotlabs/Module/Connections.php:284
msgid "Connected"
msgstr "Verbunden"
-#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Connections.php:286
msgid "Approve connection"
msgstr "Verbindung genehmigen"
-#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connections.php:288
msgid "Ignore connection"
msgstr "Verbindung ignorieren"
-#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:289
#: ../../Zotlabs/Module/Connedit.php:630
msgid "Ignore"
msgstr "Ignorieren"
-#: ../../Zotlabs/Module/Connections.php:285
+#: ../../Zotlabs/Module/Connections.php:290
msgid "Recent activity"
msgstr "Kürzliche Aktivitäten"
-#: ../../Zotlabs/Module/Connections.php:309 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/text.php:959 ../../include/nav.php:114
+#: ../../Zotlabs/Module/Connections.php:315 ../../Zotlabs/Lib/Apps.php:235
+#: ../../include/text.php:973
msgid "Connections"
msgstr "Verbindungen"
-#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Connections.php:320
msgid "Search your connections"
msgstr "Verbindungen durchsuchen"
-#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Connections.php:321
msgid "Connections search"
msgstr "Verbindung suchen"
-#: ../../Zotlabs/Module/Connections.php:316
+#: ../../Zotlabs/Module/Connections.php:322
#: ../../Zotlabs/Module/Directory.php:396
#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23
msgid "Find"
@@ -4729,12 +4801,12 @@ msgid "Please wait"
msgstr "Bitte warten"
#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237
-#: ../../Zotlabs/Lib/ThreadItem.php:751
+#: ../../Zotlabs/Lib/ThreadItem.php:747
msgid "This is you"
msgstr "Das bist Du"
#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
-#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/js_strings.php:6
+#: ../../Zotlabs/Lib/ThreadItem.php:749 ../../include/js_strings.php:6
msgid "Comment"
msgstr "Kommentar"
@@ -4784,8 +4856,8 @@ msgid "View all"
msgstr "Alles anzeigen"
#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205
-#: ../../include/conversation.php:1978 ../../include/channel.php:1539
-#: ../../include/taxonomy.php:593
+#: ../../include/conversation.php:1978 ../../include/channel.php:1540
+#: ../../include/taxonomy.php:597
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -4823,7 +4895,7 @@ msgid "Dislikes"
msgstr "Gefällt nicht"
#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
-#: ../../include/acl_selectors.php:220
+#: ../../include/acl_selectors.php:125
msgid "Close"
msgstr "Schließen"
@@ -4858,7 +4930,7 @@ msgid "Error downloading wiki: "
msgstr "Fehler beim Herunterladen des Wiki:"
#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1925 ../../include/nav.php:526
+#: ../../include/conversation.php:1925 ../../include/nav.php:494
msgid "Wikis"
msgstr "Wikis"
@@ -4882,23 +4954,23 @@ msgstr "Inhaltstyp"
#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348
#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1802
-#: ../../include/features.php:378
+#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
+#: ../../include/text.php:1868
msgid "Markdown"
msgstr "Markdown"
#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348
#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1800
+#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1866
msgid "BBcode"
msgstr "BBcode"
#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1803
+#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1869
msgid "Text"
msgstr "Text"
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:281
+#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284
#: ../../addon/gitwiki/Mod_Gitwiki.php:159
msgid "Type"
msgstr "Typ"
@@ -4965,8 +5037,11 @@ msgstr "Bild aus Fotoalben einbetten"
msgid "Embed an image from your albums"
msgstr "Betten Sie ein Bild aus Ihren Alben ein"
-#: ../../Zotlabs/Module/Wiki.php:376 ../../addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1387 ../../include/conversation.php:1434
+#: ../../Zotlabs/Module/Wiki.php:376
+#: ../../Zotlabs/Module/Profile_photo.php:465
+#: ../../Zotlabs/Module/Cover_photo.php:366
+#: ../../addon/gitwiki/Mod_Gitwiki.php:268 ../../include/conversation.php:1387
+#: ../../include/conversation.php:1434
msgid "OK"
msgstr "Ok"
@@ -5095,7 +5170,7 @@ msgstr "Ein weiteres Layout bearbeiten"
msgid "System layout"
msgstr "System-Layout"
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:248
+#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254
#: ../../include/conversation.php:1092
msgid "Poke"
msgstr "Anstupsen"
@@ -5124,97 +5199,97 @@ msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
msgid "Make this post private"
msgstr "Diesen Beitrag privat machen"
-#: ../../Zotlabs/Module/Profile_photo.php:61
+#: ../../Zotlabs/Module/Profile_photo.php:66
#: ../../Zotlabs/Module/Cover_photo.php:56
msgid "Image uploaded but image cropping failed."
msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:240
+#: ../../Zotlabs/Module/Profile_photo.php:120
+#: ../../Zotlabs/Module/Profile_photo.php:248
#: ../../include/photo/photo_driver.php:740
msgid "Profile Photos"
msgstr "Profilfotos"
-#: ../../Zotlabs/Module/Profile_photo.php:137
+#: ../../Zotlabs/Module/Profile_photo.php:142
#: ../../Zotlabs/Module/Cover_photo.php:159
msgid "Image resize failed."
msgstr "Bild-Anpassung fehlgeschlagen."
-#: ../../Zotlabs/Module/Profile_photo.php:210
+#: ../../Zotlabs/Module/Profile_photo.php:218
#: ../../addon/openclipatar/openclipatar.php:298
msgid ""
"Shift-reload the page or clear browser cache if the new photo does not "
"display immediately."
msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:225
#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195
msgid "Unable to process image"
msgstr "Kann Bild nicht verarbeiten"
-#: ../../Zotlabs/Module/Profile_photo.php:252
+#: ../../Zotlabs/Module/Profile_photo.php:260
#: ../../Zotlabs/Module/Cover_photo.php:197
msgid "Image upload failed."
msgstr "Hochladen des Bilds fehlgeschlagen."
-#: ../../Zotlabs/Module/Profile_photo.php:271
+#: ../../Zotlabs/Module/Profile_photo.php:279
#: ../../Zotlabs/Module/Cover_photo.php:214
msgid "Unable to process image."
msgstr "Kann Bild nicht verarbeiten."
-#: ../../Zotlabs/Module/Profile_photo.php:332
-#: ../../Zotlabs/Module/Profile_photo.php:379
+#: ../../Zotlabs/Module/Profile_photo.php:343
+#: ../../Zotlabs/Module/Profile_photo.php:390
#: ../../Zotlabs/Module/Cover_photo.php:307
#: ../../Zotlabs/Module/Cover_photo.php:322
msgid "Photo not available."
msgstr "Foto nicht verfügbar."
-#: ../../Zotlabs/Module/Profile_photo.php:434
+#: ../../Zotlabs/Module/Profile_photo.php:455
#: ../../Zotlabs/Module/Cover_photo.php:358
msgid "Upload File:"
msgstr "Datei hochladen:"
-#: ../../Zotlabs/Module/Profile_photo.php:435
+#: ../../Zotlabs/Module/Profile_photo.php:456
#: ../../Zotlabs/Module/Cover_photo.php:359
msgid "Select a profile:"
msgstr "Wähle ein Profil:"
-#: ../../Zotlabs/Module/Profile_photo.php:436
+#: ../../Zotlabs/Module/Profile_photo.php:457
msgid "Use Photo for Profile"
msgstr "Foto für Profil verwenden"
-#: ../../Zotlabs/Module/Profile_photo.php:436
-msgid "Upload Profile Photo"
-msgstr "Lade neues Profilfoto hoch"
+#: ../../Zotlabs/Module/Profile_photo.php:457
+msgid "Change Profile Photo"
+msgstr "Profilfoto ändern"
-#: ../../Zotlabs/Module/Profile_photo.php:437
-#: ../../addon/openclipatar/openclipatar.php:182
-#: ../../addon/openclipatar/openclipatar.php:194
+#: ../../Zotlabs/Module/Profile_photo.php:458
msgid "Use"
msgstr "Verwenden"
-#: ../../Zotlabs/Module/Profile_photo.php:443
-#: ../../Zotlabs/Module/Cover_photo.php:365
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
-
-#: ../../Zotlabs/Module/Profile_photo.php:443
-#: ../../Zotlabs/Module/Cover_photo.php:365
-msgid "select a photo from your photo albums"
-msgstr "ein Foto aus meinen Fotoalben"
-
#: ../../Zotlabs/Module/Profile_photo.php:462
-#: ../../Zotlabs/Module/Cover_photo.php:381
+#: ../../Zotlabs/Module/Profile_photo.php:463
+#: ../../Zotlabs/Module/Cover_photo.php:363
+#: ../../Zotlabs/Module/Cover_photo.php:364
+msgid "Use a photo from your albums"
+msgstr "Ein Foto aus meinen Alben verwenden"
+
+#: ../../Zotlabs/Module/Profile_photo.php:467
+#: ../../Zotlabs/Module/Cover_photo.php:369
+msgid "Select existing photo"
+msgstr "Wähle ein vorhandenes Foto aus"
+
+#: ../../Zotlabs/Module/Profile_photo.php:486
+#: ../../Zotlabs/Module/Cover_photo.php:386
msgid "Crop Image"
msgstr "Bild zuschneiden"
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Cover_photo.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:487
+#: ../../Zotlabs/Module/Cover_photo.php:387
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Cover_photo.php:384
+#: ../../Zotlabs/Module/Profile_photo.php:489
+#: ../../Zotlabs/Module/Cover_photo.php:389
msgid "Done Editing"
msgstr "Bearbeitung fertigstellen"
@@ -5226,65 +5301,65 @@ msgstr "Abwesend"
msgid "Online"
msgstr "Online"
-#: ../../Zotlabs/Module/Item.php:193
+#: ../../Zotlabs/Module/Item.php:194
msgid "Unable to locate original post."
msgstr "Originalbeitrag nicht gefunden."
-#: ../../Zotlabs/Module/Item.php:475
+#: ../../Zotlabs/Module/Item.php:476
msgid "Empty post discarded."
msgstr "Leeren Beitrag verworfen."
-#: ../../Zotlabs/Module/Item.php:853
+#: ../../Zotlabs/Module/Item.php:867
msgid "Duplicate post suppressed."
msgstr "Doppelter Beitrag unterdrückt."
-#: ../../Zotlabs/Module/Item.php:998
+#: ../../Zotlabs/Module/Item.php:1012
msgid "System error. Post not saved."
msgstr "Systemfehler. Beitrag nicht gespeichert."
-#: ../../Zotlabs/Module/Item.php:1034
+#: ../../Zotlabs/Module/Item.php:1048
msgid "Your comment is awaiting approval."
msgstr "Dein Kommentar muss noch bestätigt werden."
-#: ../../Zotlabs/Module/Item.php:1139
+#: ../../Zotlabs/Module/Item.php:1153
msgid "Unable to obtain post information from database."
msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
-#: ../../Zotlabs/Module/Item.php:1168
+#: ../../Zotlabs/Module/Item.php:1182
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
-#: ../../Zotlabs/Module/Item.php:1175
+#: ../../Zotlabs/Module/Item.php:1189
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
-#: ../../Zotlabs/Module/Ping.php:311
+#: ../../Zotlabs/Module/Ping.php:320
msgid "sent you a private message"
msgstr "hat Dir eine private Nachricht geschickt"
-#: ../../Zotlabs/Module/Ping.php:360
+#: ../../Zotlabs/Module/Ping.php:372
msgid "added your channel"
msgstr "hat deinen Kanal hinzugefügt"
-#: ../../Zotlabs/Module/Ping.php:384
+#: ../../Zotlabs/Module/Ping.php:396
msgid "requires approval"
msgstr "Zustimmung erforderlich"
-#: ../../Zotlabs/Module/Ping.php:394
+#: ../../Zotlabs/Module/Ping.php:406
msgid "g A l F d"
msgstr "l, d. F, G:i \\U\\h\\r"
-#: ../../Zotlabs/Module/Ping.php:412
+#: ../../Zotlabs/Module/Ping.php:424
msgid "[today]"
msgstr "[Heute]"
-#: ../../Zotlabs/Module/Ping.php:421
+#: ../../Zotlabs/Module/Ping.php:433
msgid "posted an event"
msgstr "hat einen Termin veröffentlicht"
-#: ../../Zotlabs/Module/Ping.php:454
+#: ../../Zotlabs/Module/Ping.php:466
msgid "shared a file with you"
msgstr "hat eine Datei mit Dir geteilt"
@@ -5294,7 +5369,7 @@ msgstr "Ungültiges Element."
#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
#: ../../Zotlabs/Module/Display.php:133
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:168
+#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
#: ../../include/help.php:81
msgid "Page not found."
msgstr "Seite nicht gefunden."
@@ -5347,9 +5422,9 @@ msgstr "Konnte die Adressbuch-Parameter nicht setzen."
msgid "Connection has been removed."
msgstr "Verbindung wurde gelöscht."
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:241
+#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247
#: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:1032 ../../include/nav.php:148
+#: ../../include/conversation.php:1032 ../../include/nav.php:114
msgid "View Profile"
msgstr "Profil ansehen"
@@ -5459,15 +5534,15 @@ msgstr "Beziehung"
msgid "Open Set Affinity section by default"
msgstr "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen"
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
msgid "Me"
msgstr "Ich"
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:27
+#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
msgid "Family"
msgstr "Familie"
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:29
+#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
msgid "Acquaintances"
msgstr "Bekannte"
@@ -5499,119 +5574,124 @@ msgstr "Profil festlegen"
msgid "Set Affinity & Profile"
msgstr "Beziehung und Profile festlegen"
-#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Module/Connedit.php:838
msgid "This connection is unreachable from this location."
msgstr "Diese Verbindung ist von diesem Ort unerreichbar."
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Zotlabs/Module/Connedit.php:839
msgid "This connection may be unreachable from other channel locations."
msgstr "Diese Verbindung könnte von anderen Standpunkten des Kanals nicht erreichbar sein."
-#: ../../Zotlabs/Module/Connedit.php:858
+#: ../../Zotlabs/Module/Connedit.php:841
msgid "Location independence is not supported by their network."
msgstr "Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
-#: ../../Zotlabs/Module/Connedit.php:864
+#: ../../Zotlabs/Module/Connedit.php:847
msgid ""
"This connection is unreachable from this location. Location independence is "
"not supported by their network."
msgstr "Diese Verbindung ist von diesem Standort aus unerreichbar. Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
-#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Defperms.php:238
+#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
#: ../../Zotlabs/Widget/Settings_menu.php:109
msgid "Connection Default Permissions"
msgstr "Standardzugriffsrechte für neue Verbindungen:"
-#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4134
+#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164
#, php-format
msgid "Connection: %s"
msgstr "Verbindung: %s"
-#: ../../Zotlabs/Module/Connedit.php:868 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
msgid "Apply these permissions automatically"
msgstr "Diese Berechtigungen automatisch anwenden"
-#: ../../Zotlabs/Module/Connedit.php:868
+#: ../../Zotlabs/Module/Connedit.php:851
msgid "Connection requests will be approved without your interaction"
msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
-#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
msgid "Permission role"
msgstr "Berechtigungsrolle"
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284
+msgid "Loading"
+msgstr "Lädt..."
+
+#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
msgid "Add permission role"
msgstr "Berechtigungsrolle hinzufügen"
-#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:860
msgid "This connection's primary address is"
msgstr "Die Hauptadresse der Verbindung ist"
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Connedit.php:861
msgid "Available locations:"
msgstr "Verfügbare Klone:"
-#: ../../Zotlabs/Module/Connedit.php:883 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
msgid ""
"The permissions indicated on this page will be applied to all new "
"connections."
msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
-#: ../../Zotlabs/Module/Connedit.php:884
+#: ../../Zotlabs/Module/Connedit.php:867
msgid "Connection Tools"
msgstr "Verbindungswerkzeuge"
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:869
msgid "Slide to adjust your degree of friendship"
msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
-#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
#: ../../include/js_strings.php:20
msgid "Rating"
msgstr "Bewertung"
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:871
msgid "Slide to adjust your rating"
msgstr "Verschieben, um Deine Bewertung einzustellen"
-#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Connedit.php:894
+#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
msgid "Optionally explain your rating"
msgstr "Optional kannst Du Deine Bewertung begründen"
-#: ../../Zotlabs/Module/Connedit.php:891
+#: ../../Zotlabs/Module/Connedit.php:874
msgid "Custom Filter"
msgstr "Benutzerdefinierter Filter"
-#: ../../Zotlabs/Module/Connedit.php:892
+#: ../../Zotlabs/Module/Connedit.php:875
msgid "Only import posts with this text"
msgstr "Nur Beiträge mit diesem Text importieren"
-#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
-#: ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Connedit.php:876
msgid "Do not import posts with this text"
msgstr "Beiträge mit diesem Text nicht importieren"
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Zotlabs/Module/Connedit.php:878
msgid "This information is public!"
msgstr "Diese Information ist öffentlich!"
-#: ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:883
msgid "Connection Pending Approval"
msgstr "Verbindung wartet auf Bestätigung"
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../Zotlabs/Module/Connedit.php:888
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
-#: ../../Zotlabs/Module/Connedit.php:912
+#: ../../Zotlabs/Module/Connedit.php:895
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -5619,11 +5699,11 @@ msgid ""
"they wont have any impact unless the inherited setting changes."
msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
-#: ../../Zotlabs/Module/Connedit.php:913
+#: ../../Zotlabs/Module/Connedit.php:896
msgid "Last update:"
msgstr "Letzte Aktualisierung:"
-#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Connedit.php:904
msgid "Details"
msgstr "Details"
@@ -5657,7 +5737,7 @@ msgid "Please enter a link URL:"
msgstr "Gib eine URL ein:"
#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:768
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:764
#: ../../include/conversation.php:1432
msgid "Encrypt text"
msgstr "Text verschlüsseln"
@@ -5691,14 +5771,14 @@ msgstr "Verfall"
msgid "min"
msgstr "min"
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:242
-#: ../../include/conversation.php:1831 ../../include/nav.php:433
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248
+#: ../../include/conversation.php:1831 ../../include/nav.php:401
msgid "Photos"
msgstr "Fotos"
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:237
-#: ../../Zotlabs/Storage/Browser.php:269 ../../include/conversation.php:1839
-#: ../../include/nav.php:441
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243
+#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1839
+#: ../../include/nav.php:409
msgid "Files"
msgstr "Dateien"
@@ -5738,7 +5818,7 @@ msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
msgid "Submit and proceed"
msgstr "Absenden und fortfahren"
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2289
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403
msgid "Menus"
msgstr "Menüs"
@@ -5790,12 +5870,12 @@ msgstr "Menü Titel wie er von anderen gesehen wird"
msgid "Allow bookmarks"
msgstr "Erlaube Lesezeichen"
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2290
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404
msgid "Layouts"
msgstr "Layouts"
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:245
-#: ../../include/nav.php:208 ../../include/nav.php:312
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251
+#: ../../include/nav.php:176 ../../include/nav.php:280
#: ../../include/help.php:68 ../../include/help.php:74
msgid "Help"
msgstr "Hilfe"
@@ -5813,20 +5893,49 @@ msgid "Download PDL file"
msgstr "PDL-Datei herunterladen"
#: ../../Zotlabs/Module/Cloud.php:114
+msgid "Please refresh page"
+msgstr "Bitte die Seite neu laden"
+
+#: ../../Zotlabs/Module/Cloud.php:117
msgid "Unknown error"
msgstr "Unbekannter Fehler"
+#: ../../Zotlabs/Module/Email_validation.php:24
+#: ../../Zotlabs/Module/Email_resend.php:12
+msgid "Token verification failed."
+msgstr "Überprüfung des Verifizierungscodes fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Email_validation.php:36
+msgid "Email Verification Required"
+msgstr "Email-Überprüfung erforderlich"
+
+#: ../../Zotlabs/Module/Email_validation.php:37
+#, php-format
+msgid ""
+"A verification token was sent to your email address [%s]. Enter that token "
+"here to complete the account verification step. Please allow a few minutes "
+"for delivery, and check your spam folder if you do not see the message."
+msgstr "Ein Verifizierungscode wurde an Deine Emailadresse versendet [%s]. Gib diesen Code hier ein, um die Überprüfung abzuschließen. Bedenke, dass die Zustellung der Mail einige Zeit dauern kann, und überprüfe ggf. auch Spam- und andere Filter-Ordner, falls die Nachricht nicht erscheint."
+
+#: ../../Zotlabs/Module/Email_validation.php:38
+msgid "Resend Email"
+msgstr "Email erneut versenden"
+
+#: ../../Zotlabs/Module/Email_validation.php:41
+msgid "Validation token"
+msgstr "Verifizierungscode"
+
#: ../../Zotlabs/Module/Tagger.php:48
msgid "Post not found."
msgstr "Beitrag nicht gefunden."
#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
-#: ../../include/bbcode.php:335
+#: ../../include/bbcode.php:339
msgid "post"
msgstr "Beitrag"
#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
-#: ../../include/text.php:1946
+#: ../../include/text.php:2012
msgid "comment"
msgstr "Kommentar"
@@ -5874,7 +5983,7 @@ msgid "Could not create privacy group."
msgstr "Gruppe konnte nicht erstellt werden."
#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
-#: ../../include/items.php:4101
+#: ../../include/items.php:4131
msgid "Privacy group not found."
msgstr "Gruppe nicht gefunden."
@@ -6049,7 +6158,8 @@ msgstr "Persönlich"
msgid "Relation"
msgstr "Beziehung"
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58
+#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53
+#: ../../include/datetime.php:58
msgid "Miscellaneous"
msgstr "Verschiedenes"
@@ -6191,10 +6301,73 @@ msgid "Profile Image"
msgstr "Profilfoto:"
#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297
-#: ../../include/nav.php:151
+#: ../../include/nav.php:117
msgid "Edit Profiles"
msgstr "Profile bearbeiten"
+#: ../../Zotlabs/Module/Go.php:21
+msgid "This page is available only to site members"
+msgstr "Diese Seite ist nur für Mitglieder verfügbar"
+
+#: ../../Zotlabs/Module/Go.php:27
+msgid "Welcome"
+msgstr "Willkommen"
+
+#: ../../Zotlabs/Module/Go.php:29
+msgid "What would you like to do?"
+msgstr "Was möchtest Du gerne tun?"
+
+#: ../../Zotlabs/Module/Go.php:31
+msgid ""
+"Please bookmark this page if you would like to return to it in the future"
+msgstr "Bitte speichere diese Seite in Deinen Lesezeichen, falls Du später zu ihr zurückkehren möchtest."
+
+#: ../../Zotlabs/Module/Go.php:35
+msgid "Upload a profile photo"
+msgstr "Ein Profilfoto hochladen"
+
+#: ../../Zotlabs/Module/Go.php:36
+msgid "Upload a cover photo"
+msgstr "Ein Titelbild hochladen"
+
+#: ../../Zotlabs/Module/Go.php:37
+msgid "Edit your default profile"
+msgstr "Dein Standardprofil bearbeiten"
+
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43
+msgid "View friend suggestions"
+msgstr "Freundschafts- und Verbindungsvorschläge ansehen"
+
+#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42
+msgid "View the channel directory"
+msgstr "Das Kanalverzeichnis ansehen"
+
+#: ../../Zotlabs/Module/Go.php:40
+msgid "View/edit your channel settings"
+msgstr "Deine Kanaleinstellungen ansehen/bearbeiten"
+
+#: ../../Zotlabs/Module/Go.php:41
+msgid "View the site or project documentation"
+msgstr "Die Website-/Projektdokumentation ansehen"
+
+#: ../../Zotlabs/Module/Go.php:42
+msgid "Visit your channel homepage"
+msgstr "Deine Kanal-Startseite aufrufen"
+
+#: ../../Zotlabs/Module/Go.php:43
+msgid ""
+"View your connections and/or add somebody whose address you already know"
+msgstr "Deine Verbindungen ansehen und/oder jemanden hinzufügen, dessen Kanal-Adresse Du bereits kennst"
+
+#: ../../Zotlabs/Module/Go.php:44
+msgid ""
+"View your personal stream (this may be empty until you add some connections)"
+msgstr "Deinen persönlichen Beitragsstrom ansehen (dieser kann leer sein, bis Du ein paar Verbindungen hinzugefügt hast)"
+
+#: ../../Zotlabs/Module/Go.php:52
+msgid "View the public stream. Warning: this content is not moderated"
+msgstr "Den öffentlichen Beitragsstrom ansehen. Warnung: Diese Inhalte sind nicht moderiert."
+
#: ../../Zotlabs/Module/Editwebpage.php:139
msgid "Page link"
msgstr "Seiten-Link"
@@ -6207,8 +6380,8 @@ msgstr "Webseite bearbeiten"
msgid "Create a new channel"
msgstr "Neuen Kanal anlegen"
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:234
-#: ../../include/nav.php:136 ../../include/nav.php:222
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240
+#: ../../include/nav.php:102 ../../include/nav.php:190
msgid "Channel Manager"
msgstr "Kanal-Manager"
@@ -6242,7 +6415,13 @@ msgstr "%d neue Vorstellungen"
msgid "Delegated Channel"
msgstr "Delegierte Kanäle"
-#: ../../Zotlabs/Module/Cards.php:95
+#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890
+#: ../../include/features.php:114 ../../include/nav.php:458
+msgid "Cards"
+msgstr "Karten"
+
+#: ../../Zotlabs/Module/Cards.php:99
msgid "Add Card"
msgstr "Karte hinzufügen"
@@ -6250,45 +6429,45 @@ msgstr "Karte hinzufügen"
msgid "This directory server requires an access token"
msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Siteinfo.php:18
msgid "About this site"
msgstr "Über diese Seite"
-#: ../../Zotlabs/Module/Siteinfo.php:20
+#: ../../Zotlabs/Module/Siteinfo.php:19
msgid "Site Name"
msgstr "Seitenname"
-#: ../../Zotlabs/Module/Siteinfo.php:24
+#: ../../Zotlabs/Module/Siteinfo.php:23
msgid "Administrator"
msgstr "Administrator"
-#: ../../Zotlabs/Module/Siteinfo.php:26 ../../Zotlabs/Module/Register.php:229
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232
msgid "Terms of Service"
msgstr "Nutzungsbedingungen"
-#: ../../Zotlabs/Module/Siteinfo.php:27
+#: ../../Zotlabs/Module/Siteinfo.php:26
msgid "Software and Project information"
msgstr "Software und Projektinformationen"
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Zotlabs/Module/Siteinfo.php:27
msgid "This site is powered by $Projectname"
msgstr "Diese Website wird bereitgestellt durch $Projectname"
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Zotlabs/Module/Siteinfo.php:28
msgid ""
"Federated and decentralised networking and identity services provided by Zot"
msgstr "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot"
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Zotlabs/Module/Siteinfo.php:30
#, php-format
msgid "Version %s"
msgstr "Version %s"
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Zotlabs/Module/Siteinfo.php:31
msgid "Project homepage"
msgstr "Projekt-Website"
-#: ../../Zotlabs/Module/Siteinfo.php:33
+#: ../../Zotlabs/Module/Siteinfo.php:32
msgid "Developer homepage"
msgstr "Entwickler-Website"
@@ -6329,8 +6508,8 @@ msgstr "Webseitenelemente exportieren"
msgid "Export selected"
msgstr "Exportieren ausgewählt"
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:238
-#: ../../include/conversation.php:1912 ../../include/nav.php:513
+#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244
+#: ../../include/conversation.php:1912 ../../include/nav.php:481
msgid "Webpages"
msgstr "Webseiten"
@@ -6490,7 +6669,7 @@ msgid "*"
msgstr "*"
#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:228
+#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274
msgid "Channel Sources"
msgstr "Kanal-Quellen"
@@ -6546,88 +6725,88 @@ msgstr "Quelle gelöscht"
msgid "Unable to remove source."
msgstr "Konnte die Quelle nicht löschen."
-#: ../../Zotlabs/Module/Like.php:22
+#: ../../Zotlabs/Module/Like.php:54
msgid "Like/Dislike"
msgstr "Mögen/Nicht mögen"
-#: ../../Zotlabs/Module/Like.php:27
+#: ../../Zotlabs/Module/Like.php:59
msgid "This action is restricted to members."
msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
-#: ../../Zotlabs/Module/Like.php:28
+#: ../../Zotlabs/Module/Like.php:60
msgid ""
"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
"href=\"register\">register as a new $Projectname member</a> to continue."
msgstr "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner $Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues $Projectname-Mitglied</a>."
-#: ../../Zotlabs/Module/Like.php:108 ../../Zotlabs/Module/Like.php:134
-#: ../../Zotlabs/Module/Like.php:172
+#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
+#: ../../Zotlabs/Module/Like.php:173
msgid "Invalid request."
msgstr "Ungültige Anfrage."
-#: ../../Zotlabs/Module/Like.php:120 ../../include/conversation.php:122
+#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122
msgid "channel"
msgstr "Kanal"
-#: ../../Zotlabs/Module/Like.php:149
+#: ../../Zotlabs/Module/Like.php:150
msgid "thing"
msgstr "Sache"
-#: ../../Zotlabs/Module/Like.php:195
+#: ../../Zotlabs/Module/Like.php:196
msgid "Channel unavailable."
msgstr "Kanal nicht vorhanden."
-#: ../../Zotlabs/Module/Like.php:243
+#: ../../Zotlabs/Module/Like.php:244
msgid "Previous action reversed."
msgstr "Die vorherige Aktion wurde rückgängig gemacht."
-#: ../../Zotlabs/Module/Like.php:435 ../../addon/diaspora/Receiver.php:1462
-#: ../../addon/pubcrawl/as.php:1330 ../../include/conversation.php:160
+#: ../../Zotlabs/Module/Like.php:436 ../../addon/diaspora/Receiver.php:1547
+#: ../../addon/pubcrawl/as.php:1394 ../../include/conversation.php:160
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s gefällt %2$ss %3$s"
-#: ../../Zotlabs/Module/Like.php:437 ../../addon/pubcrawl/as.php:1332
+#: ../../Zotlabs/Module/Like.php:438 ../../addon/pubcrawl/as.php:1396
#: ../../include/conversation.php:163
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s gefällt %2$ss %3$s nicht"
-#: ../../Zotlabs/Module/Like.php:439
+#: ../../Zotlabs/Module/Like.php:440
#, php-format
msgid "%1$s agrees with %2$s's %3$s"
msgstr "%1$s stimmt %2$ss %3$s zu"
-#: ../../Zotlabs/Module/Like.php:441
+#: ../../Zotlabs/Module/Like.php:442
#, php-format
msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr "%1$s lehnt %2$ss %3$s ab"
-#: ../../Zotlabs/Module/Like.php:443
+#: ../../Zotlabs/Module/Like.php:444
#, php-format
msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr "%1$s enthält sich zu %2$ss %3$s"
-#: ../../Zotlabs/Module/Like.php:445
+#: ../../Zotlabs/Module/Like.php:446 ../../addon/diaspora/Receiver.php:2031
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr "%1$s nimmt an %2$ss %3$s teil"
-#: ../../Zotlabs/Module/Like.php:447
+#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2033
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
-#: ../../Zotlabs/Module/Like.php:449
+#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2035
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
-#: ../../Zotlabs/Module/Like.php:561
+#: ../../Zotlabs/Module/Like.php:562
msgid "Action completed."
msgstr "Aktion durchgeführt."
-#: ../../Zotlabs/Module/Like.php:562
+#: ../../Zotlabs/Module/Like.php:563
msgid "Thank you."
msgstr "Vielen Dank."
@@ -6650,12 +6829,12 @@ msgstr "Status:"
msgid "Homepage: "
msgstr "Webseite:"
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1564
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1565
msgid "Age:"
msgstr "Alter:"
#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392
-#: ../../include/event.php:53 ../../include/event.php:85
+#: ../../include/event.php:54 ../../include/event.php:86
msgid "Location:"
msgstr "Ort:"
@@ -6663,11 +6842,11 @@ msgstr "Ort:"
msgid "Description:"
msgstr "Beschreibung:"
-#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1580
+#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1581
msgid "Hometown:"
msgstr "Heimatstadt:"
-#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1588
+#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1589
msgid "About:"
msgstr "Über:"
@@ -6907,19 +7086,19 @@ msgstr "Software"
msgid "Rate"
msgstr "Bewerten"
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:263
+#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267
msgid "webpage"
msgstr "Webseite"
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:269
+#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273
msgid "block"
msgstr "Block"
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:266
+#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270
msgid "layout"
msgstr "Layout"
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:272
+#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276
msgid "menu"
msgstr "Menü"
@@ -6979,21 +7158,21 @@ msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137
+#: ../../Zotlabs/Module/Register.php:132
+msgid "Registration successful. Continue to create your first channel..."
+msgstr "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst..."
+
+#: ../../Zotlabs/Module/Register.php:135
msgid ""
"Registration successful. Please check your email for validation "
"instructions."
msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
-#: ../../Zotlabs/Module/Register.php:135
-msgid "Registration successful. Continue to create your first channel..."
-msgstr "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst..."
-
-#: ../../Zotlabs/Module/Register.php:144
+#: ../../Zotlabs/Module/Register.php:142
msgid "Your registration is pending approval by the site owner."
msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
-#: ../../Zotlabs/Module/Register.php:147
+#: ../../Zotlabs/Module/Register.php:145
msgid "Your registration can not be processed."
msgstr "Deine Registrierung konnte nicht verarbeitet werden."
@@ -7015,97 +7194,97 @@ msgid ""
"Please try again tomorrow."
msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Zotlabs/Module/Register.php:238
#, php-format
msgid "I accept the %s for this website"
msgstr "Ich akzeptiere die %s für diese Webseite"
-#: ../../Zotlabs/Module/Register.php:241
+#: ../../Zotlabs/Module/Register.php:245
#, php-format
msgid "I am over %s years of age and accept the %s for this website"
msgstr "Ich bin älter als %s Jahre und akzeptiere die %s dieser Website."
-#: ../../Zotlabs/Module/Register.php:245
+#: ../../Zotlabs/Module/Register.php:250
msgid "Your email address"
msgstr "Ihre E-Mail Adresse"
-#: ../../Zotlabs/Module/Register.php:246
+#: ../../Zotlabs/Module/Register.php:251
msgid "Choose a password"
msgstr "Passwort"
-#: ../../Zotlabs/Module/Register.php:247
+#: ../../Zotlabs/Module/Register.php:252
msgid "Please re-enter your password"
msgstr "Bitte gib Dein Passwort noch einmal ein"
-#: ../../Zotlabs/Module/Register.php:248
+#: ../../Zotlabs/Module/Register.php:253
msgid "Please enter your invitation code"
msgstr "Bitte trage Deinen Einladungs-Code ein"
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Register.php:258
msgid "no"
msgstr "nein"
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Register.php:258
msgid "yes"
msgstr "ja"
-#: ../../Zotlabs/Module/Register.php:268
+#: ../../Zotlabs/Module/Register.php:274
msgid "Membership on this site is by invitation only."
msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
-#: ../../Zotlabs/Module/Register.php:280 ../../boot.php:1645
-#: ../../include/nav.php:196
+#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563
+#: ../../include/nav.php:164
msgid "Register"
msgstr "Registrieren"
-#: ../../Zotlabs/Module/Register.php:281
+#: ../../Zotlabs/Module/Register.php:287
msgid ""
-"This site may require email verification after submitting this form. If you "
-"are returned to a login page, please check your email for instructions."
-msgstr "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen."
+"This site requires email verification. After completing this form, please "
+"check your email for further instructions."
+msgstr "Diese Website erfordert eine Email-Bestätigung. Bitte prüfe Deine Emails nach Ausfüllen und Absenden des Formulars, um weitere Hinweise zu bekommen."
#: ../../Zotlabs/Module/Cover_photo.php:136
#: ../../Zotlabs/Module/Cover_photo.php:186
msgid "Cover Photos"
msgstr "Cover Foto"
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4478
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508
msgid "female"
msgstr "weiblich"
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4479
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509
#, php-format
msgid "%1$s updated her %2$s"
msgstr "%1$s hat ihr %2$s aktualisiert"
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4480
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510
msgid "male"
msgstr "männlich"
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4481
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511
#, php-format
msgid "%1$s updated his %2$s"
msgstr "%1$s hat sein %2$s aktualisiert"
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4483
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513
#, php-format
msgid "%1$s updated their %2$s"
msgstr "%1$s hat sein/ihr %2$s aktualisiert"
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2053
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2059
msgid "cover photo"
msgstr "Cover Foto"
#: ../../Zotlabs/Module/Cover_photo.php:360
-msgid "Upload Cover Photo"
-msgstr "Cover Foto hochladen"
+msgid "Change Cover Photo"
+msgstr "Titelbild ändern"
#: ../../Zotlabs/Module/Help.php:23
msgid "Documentation Search"
msgstr "Suche in der Dokumentation"
#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821
-#: ../../include/nav.php:423
+#: ../../include/nav.php:391
msgid "About"
msgstr "Über"
@@ -7129,11 +7308,11 @@ msgstr "$Projectname-Dokumentation"
msgid "Contents"
msgstr "Inhalt"
-#: ../../Zotlabs/Module/Display.php:349
+#: ../../Zotlabs/Module/Display.php:351
msgid "Article"
msgstr "Artikel"
-#: ../../Zotlabs/Module/Display.php:401
+#: ../../Zotlabs/Module/Display.php:403
msgid "Item has been removed."
msgstr "Der Beitrag wurde entfernt."
@@ -7149,44 +7328,44 @@ msgstr "Schlagwort entfernen"
msgid "Select a tag to remove: "
msgstr "Schlagwort zum Entfernen auswählen:"
-#: ../../Zotlabs/Module/Network.php:97
+#: ../../Zotlabs/Module/Network.php:100
msgid "No such group"
msgstr "Gruppe nicht gefunden"
-#: ../../Zotlabs/Module/Network.php:137
+#: ../../Zotlabs/Module/Network.php:142
msgid "No such channel"
msgstr "Kanal nicht gefunden"
-#: ../../Zotlabs/Module/Network.php:142
+#: ../../Zotlabs/Module/Network.php:147
msgid "forum"
msgstr "Forum"
-#: ../../Zotlabs/Module/Network.php:154
+#: ../../Zotlabs/Module/Network.php:159
msgid "Search Results For:"
msgstr "Suchergebnisse für:"
-#: ../../Zotlabs/Module/Network.php:222
+#: ../../Zotlabs/Module/Network.php:230
msgid "Privacy group is empty"
msgstr "Gruppe ist leer"
-#: ../../Zotlabs/Module/Network.php:231
+#: ../../Zotlabs/Module/Network.php:240
msgid "Privacy group: "
msgstr "Gruppe:"
-#: ../../Zotlabs/Module/Network.php:257
+#: ../../Zotlabs/Module/Network.php:268
msgid "Invalid connection."
msgstr "Ungültige Verbindung."
-#: ../../Zotlabs/Module/Network.php:276 ../../addon/redred/redred.php:65
+#: ../../Zotlabs/Module/Network.php:289 ../../addon/redred/redred.php:65
msgid "Invalid channel."
msgstr "Ungültiger Kanal."
-#: ../../Zotlabs/Module/Acl.php:358
+#: ../../Zotlabs/Module/Acl.php:361
msgid "network"
msgstr "Netzwerk"
#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../addon/opensearch/opensearch.php:42
+#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
msgid "$Projectname"
msgstr "$Projectname"
@@ -7236,7 +7415,7 @@ msgid "Show URL to this file"
msgstr "URL zu dieser Datei anzeigen"
#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:394
+#: ../../Zotlabs/Storage/Browser.php:397
msgid "Show in your contacts shared folder"
msgstr "Im geteilten Ordner Deiner Kontakte anzeigen"
@@ -7252,16 +7431,24 @@ msgstr "Keine gemeinsamen Verbindungen."
msgid "View Common Connections"
msgstr "Zeige gemeinsame Verbindungen"
+#: ../../Zotlabs/Module/Email_resend.php:30
+msgid "Email verification resent"
+msgstr "Email zur Verifizierung wurde erneut versendet"
+
+#: ../../Zotlabs/Module/Email_resend.php:33
+msgid "Unable to resend email verification message."
+msgstr "Erneutes Versenden der Email zur Verifizierung nicht möglich."
+
#: ../../Zotlabs/Module/Viewconnections.php:65
msgid "No connections."
msgstr "Keine Verbindungen."
-#: ../../Zotlabs/Module/Viewconnections.php:78
+#: ../../Zotlabs/Module/Viewconnections.php:83
#, php-format
msgid "Visit %s's profile [%s]"
msgstr "%ss Profil [%s] besuchen"
-#: ../../Zotlabs/Module/Viewconnections.php:107
+#: ../../Zotlabs/Module/Viewconnections.php:113
msgid "View Connections"
msgstr "Verbindungen anzeigen"
@@ -7370,7 +7557,7 @@ msgid ""
"Password reset failed."
msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1673
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591
msgid "Password Reset"
msgstr "Zurücksetzen des Kennworts"
@@ -7444,143 +7631,143 @@ msgstr "4. Experte - Ich kann Computercode schreiben"
msgid "5. Wizard - I probably know more than you do"
msgstr "5. Zauberer - ich kann wahrscheinlich mehr als Du"
-#: ../../Zotlabs/Lib/Apps.php:225
+#: ../../Zotlabs/Lib/Apps.php:231
msgid "Site Admin"
msgstr "Hub-Administration"
-#: ../../Zotlabs/Lib/Apps.php:226 ../../addon/buglink/buglink.php:16
+#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
msgid "Report Bug"
msgstr "Fehler melden"
-#: ../../Zotlabs/Lib/Apps.php:227
+#: ../../Zotlabs/Lib/Apps.php:233
msgid "View Bookmarks"
msgstr "Lesezeichen ansehen"
-#: ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Lib/Apps.php:234
msgid "My Chatrooms"
msgstr "Meine Chaträume"
-#: ../../Zotlabs/Lib/Apps.php:230
+#: ../../Zotlabs/Lib/Apps.php:236
msgid "Firefox Share"
msgstr "Teilen-Knopf für Firefox"
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Zotlabs/Lib/Apps.php:237
msgid "Remote Diagnostics"
msgstr "Ferndiagnose"
-#: ../../Zotlabs/Lib/Apps.php:232 ../../include/features.php:352
+#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390
msgid "Suggest Channels"
msgstr "Kanäle vorschlagen"
-#: ../../Zotlabs/Lib/Apps.php:233 ../../boot.php:1664
-#: ../../include/nav.php:160 ../../include/nav.php:164
+#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582
+#: ../../include/nav.php:126 ../../include/nav.php:130
msgid "Login"
msgstr "Anmelden"
-#: ../../Zotlabs/Lib/Apps.php:235 ../../include/nav.php:105
+#: ../../Zotlabs/Lib/Apps.php:241
msgid "Activity"
msgstr "Aktivität"
-#: ../../Zotlabs/Lib/Apps.php:239 ../../include/conversation.php:1928
-#: ../../include/features.php:95 ../../include/nav.php:529
+#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928
+#: ../../include/features.php:87 ../../include/nav.php:497
msgid "Wiki"
msgstr "Wiki"
-#: ../../Zotlabs/Lib/Apps.php:240 ../../include/nav.php:109
+#: ../../Zotlabs/Lib/Apps.php:246
msgid "Channel Home"
msgstr "Mein Kanal"
-#: ../../Zotlabs/Lib/Apps.php:243 ../../include/conversation.php:1850
-#: ../../include/conversation.php:1853 ../../include/nav.php:131
+#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1850
+#: ../../include/conversation.php:1853
msgid "Events"
msgstr "Termine"
-#: ../../Zotlabs/Lib/Apps.php:244
+#: ../../Zotlabs/Lib/Apps.php:250
msgid "Directory"
msgstr "Verzeichnis"
-#: ../../Zotlabs/Lib/Apps.php:246 ../../include/nav.php:123
+#: ../../Zotlabs/Lib/Apps.php:252
msgid "Mail"
msgstr "Mail"
-#: ../../Zotlabs/Lib/Apps.php:249
+#: ../../Zotlabs/Lib/Apps.php:255
msgid "Chat"
msgstr "Chat"
-#: ../../Zotlabs/Lib/Apps.php:251
+#: ../../Zotlabs/Lib/Apps.php:257
msgid "Probe"
msgstr "Testen"
-#: ../../Zotlabs/Lib/Apps.php:252
+#: ../../Zotlabs/Lib/Apps.php:258
msgid "Suggest"
msgstr "Empfehlen"
-#: ../../Zotlabs/Lib/Apps.php:253
+#: ../../Zotlabs/Lib/Apps.php:259
msgid "Random Channel"
msgstr "Zufälliger Kanal"
-#: ../../Zotlabs/Lib/Apps.php:254
+#: ../../Zotlabs/Lib/Apps.php:260
msgid "Invite"
msgstr "Einladen"
-#: ../../Zotlabs/Lib/Apps.php:255 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26
msgid "Features"
msgstr "Funktionen"
-#: ../../Zotlabs/Lib/Apps.php:256 ../../addon/openid/MysqlProvider.php:69
+#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69
msgid "Language"
msgstr "Sprache"
-#: ../../Zotlabs/Lib/Apps.php:257
+#: ../../Zotlabs/Lib/Apps.php:263
msgid "Post"
msgstr "Beitrag schreiben"
-#: ../../Zotlabs/Lib/Apps.php:258 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58
#: ../../addon/openid/MysqlProvider.php:59
#: ../../addon/openid/MysqlProvider.php:60
msgid "Profile Photo"
msgstr "Profilfoto"
-#: ../../Zotlabs/Lib/Apps.php:397
+#: ../../Zotlabs/Lib/Apps.php:407
msgid "Purchase"
msgstr "Kaufen"
-#: ../../Zotlabs/Lib/Apps.php:401
+#: ../../Zotlabs/Lib/Apps.php:411
msgid "Undelete"
msgstr "Wieder hergestellt"
-#: ../../Zotlabs/Lib/Apps.php:409
+#: ../../Zotlabs/Lib/Apps.php:419
msgid "Add to app-tray"
msgstr "Zum App-Menü hinzufügen"
-#: ../../Zotlabs/Lib/Apps.php:410
+#: ../../Zotlabs/Lib/Apps.php:420
msgid "Remove from app-tray"
msgstr "Aus dem App-Menü entfernen"
-#: ../../Zotlabs/Lib/Apps.php:411
+#: ../../Zotlabs/Lib/Apps.php:421
msgid "Pin to navbar"
msgstr "An Navigationsleiste anpinnen"
-#: ../../Zotlabs/Lib/Apps.php:412
+#: ../../Zotlabs/Lib/Apps.php:422
msgid "Unpin from navbar"
msgstr "Von Navigationsleiste entfernen"
-#: ../../Zotlabs/Lib/Permcat.php:58
+#: ../../Zotlabs/Lib/Permcat.php:82
msgctxt "permcat"
msgid "default"
msgstr "Standard"
-#: ../../Zotlabs/Lib/Permcat.php:96
+#: ../../Zotlabs/Lib/Permcat.php:133
msgctxt "permcat"
msgid "follower"
msgstr "Abonnent"
-#: ../../Zotlabs/Lib/Permcat.php:100
+#: ../../Zotlabs/Lib/Permcat.php:137
msgctxt "permcat"
msgid "contributor"
msgstr "Beitragender"
-#: ../../Zotlabs/Lib/Permcat.php:104
+#: ../../Zotlabs/Lib/Permcat.php:141
msgctxt "permcat"
msgid "publisher"
msgstr "Autor"
@@ -7649,18 +7836,18 @@ msgid "Message"
msgstr "Nachricht"
#: ../../Zotlabs/Lib/NativeWikiPage.php:597
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:674
-#: ../../include/bbcode.php:822
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:706
+#: ../../include/bbcode.php:865
msgid "Different viewers will see this text differently"
msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
#: ../../Zotlabs/Lib/PermissionDescription.php:34
-#: ../../include/acl_selectors.php:128
+#: ../../include/acl_selectors.php:33
msgid "Visible to your default audience"
msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:201
+#: ../../include/acl_selectors.php:106
msgid "Only me"
msgstr "Nur ich"
@@ -7741,8 +7928,8 @@ msgstr "Der Chatraum ist voll"
msgid "$Projectname Notification"
msgstr "$Projectname-Benachrichtigung"
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:283
-#: ../../addon/diaspora/util.php:296 ../../addon/diaspora/p.php:48
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
+#: ../../addon/diaspora/util.php:321 ../../addon/diaspora/p.php:48
msgid "$projectname"
msgstr "$projectname"
@@ -7755,219 +7942,258 @@ msgstr "Danke."
msgid "%s Administrator"
msgstr "der Administrator von %s"
-#: ../../Zotlabs/Lib/Enotify.php:116
+#: ../../Zotlabs/Lib/Enotify.php:66
+#, php-format
+msgid "This email was sent by %1$s at %2$s."
+msgstr "Diese Email wurde von %1$s auf %2$s gesendet."
+
+#: ../../Zotlabs/Lib/Enotify.php:67
+#, php-format
+msgid ""
+"To stop receiving these messages, please adjust your Notification Settings "
+"at %s"
+msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine Benachrichtigungseinstellungen unter folgendem Link an: %s"
+
+#: ../../Zotlabs/Lib/Enotify.php:68
+#, php-format
+msgid "To stop receiving these messages, please adjust your %s."
+msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an."
+
+#: ../../Zotlabs/Lib/Enotify.php:120
#, php-format
msgid "%s <!item_type!>"
msgstr "%s <!item_type!>"
-#: ../../Zotlabs/Lib/Enotify.php:120
+#: ../../Zotlabs/Lib/Enotify.php:124
#, php-format
msgid "[$Projectname:Notify] New mail received at %s"
msgstr "[$Projectname:Benachrichtigung] Neue Mail empfangen auf %s"
-#: ../../Zotlabs/Lib/Enotify.php:122
+#: ../../Zotlabs/Lib/Enotify.php:126
#, php-format
msgid "%1$s, %2$s sent you a new private message at %3$s."
msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Zotlabs/Lib/Enotify.php:127
#, php-format
msgid "%1$s sent you %2$s."
msgstr "%1$s hat Dir %2$s geschickt."
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Zotlabs/Lib/Enotify.php:127
msgid "a private message"
msgstr "eine private Nachricht"
-#: ../../Zotlabs/Lib/Enotify.php:124
+#: ../../Zotlabs/Lib/Enotify.php:128
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
-#: ../../Zotlabs/Lib/Enotify.php:184
+#: ../../Zotlabs/Lib/Enotify.php:141
+msgid "commented on"
+msgstr "kommentierte"
+
+#: ../../Zotlabs/Lib/Enotify.php:152
+msgid "liked"
+msgstr "gefiel"
+
+#: ../../Zotlabs/Lib/Enotify.php:155
+msgid "disliked"
+msgstr "missfiel"
+
+#: ../../Zotlabs/Lib/Enotify.php:198
#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
+msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]"
+msgstr "%1$s, %2$s %3$s [zrl=%4$s]ein %5$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:192
+#: ../../Zotlabs/Lib/Enotify.php:207
#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
+msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]"
+msgstr "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:201
+#: ../../Zotlabs/Lib/Enotify.php:217
#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
+msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]"
+msgstr "%1$s, %2$s %3$s [zrl=%4$s]Dein %5$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:213
+#: ../../Zotlabs/Lib/Enotify.php:230
#, php-format
msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
msgstr "[$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1$d von %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:215
+#: ../../Zotlabs/Lib/Enotify.php:232
#, php-format
msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:216
+#: ../../Zotlabs/Lib/Enotify.php:233
#, php-format
msgid "%1$s, %2$s commented on an item/conversation you have been following."
msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
-#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301
-#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344
-#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376
+#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318
+#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
-#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224
+#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
#, php-format
msgid "Please visit %s to approve or reject this comment."
msgstr "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen."
-#: ../../Zotlabs/Lib/Enotify.php:282
+#: ../../Zotlabs/Lib/Enotify.php:299
#, php-format
msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
msgstr "%1$s, %2$s gefällt [zrl=%3$s]dein %4$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:297
+#: ../../Zotlabs/Lib/Enotify.php:314
#, php-format
msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten"
-#: ../../Zotlabs/Lib/Enotify.php:298
+#: ../../Zotlabs/Lib/Enotify.php:315
#, php-format
msgid "%1$s, %2$s liked an item/conversation you created."
msgstr "%1$s, %2$s gefällt ein Beitrag oder eine Unterhaltung von Dir"
-#: ../../Zotlabs/Lib/Enotify.php:309
+#: ../../Zotlabs/Lib/Enotify.php:326
#, php-format
msgid "[$Projectname:Notify] %s posted to your profile wall"
msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"
-#: ../../Zotlabs/Lib/Enotify.php:311
+#: ../../Zotlabs/Lib/Enotify.php:328
#, php-format
msgid "%1$s, %2$s posted to your profile wall at %3$s"
msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
-#: ../../Zotlabs/Lib/Enotify.php:313
+#: ../../Zotlabs/Lib/Enotify.php:330
#, php-format
msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
-#: ../../Zotlabs/Lib/Enotify.php:337
+#: ../../Zotlabs/Lib/Enotify.php:354
#, php-format
msgid "[$Projectname:Notify] %s tagged you"
msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt"
-#: ../../Zotlabs/Lib/Enotify.php:338
+#: ../../Zotlabs/Lib/Enotify.php:355
#, php-format
msgid "%1$s, %2$s tagged you at %3$s"
msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
-#: ../../Zotlabs/Lib/Enotify.php:339
+#: ../../Zotlabs/Lib/Enotify.php:356
#, php-format
msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
-#: ../../Zotlabs/Lib/Enotify.php:351
+#: ../../Zotlabs/Lib/Enotify.php:368
#, php-format
msgid "[$Projectname:Notify] %1$s poked you"
msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst"
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Zotlabs/Lib/Enotify.php:369
#, php-format
msgid "%1$s, %2$s poked you at %3$s"
msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
-#: ../../Zotlabs/Lib/Enotify.php:353
+#: ../../Zotlabs/Lib/Enotify.php:370
#, php-format
msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
-#: ../../Zotlabs/Lib/Enotify.php:369
+#: ../../Zotlabs/Lib/Enotify.php:386
#, php-format
msgid "[$Projectname:Notify] %s tagged your post"
msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
-#: ../../Zotlabs/Lib/Enotify.php:370
+#: ../../Zotlabs/Lib/Enotify.php:387
#, php-format
msgid "%1$s, %2$s tagged your post at %3$s"
msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
-#: ../../Zotlabs/Lib/Enotify.php:371
+#: ../../Zotlabs/Lib/Enotify.php:388
#, php-format
msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
-#: ../../Zotlabs/Lib/Enotify.php:383
+#: ../../Zotlabs/Lib/Enotify.php:400
msgid "[$Projectname:Notify] Introduction received"
msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"
-#: ../../Zotlabs/Lib/Enotify.php:384
+#: ../../Zotlabs/Lib/Enotify.php:401
#, php-format
msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
-#: ../../Zotlabs/Lib/Enotify.php:385
+#: ../../Zotlabs/Lib/Enotify.php:402
#, php-format
msgid ""
"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
-#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408
+#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425
#, php-format
msgid "You may visit their profile at %s"
msgstr "Du kannst Dir das Profil unter %s ansehen"
-#: ../../Zotlabs/Lib/Enotify.php:391
+#: ../../Zotlabs/Lib/Enotify.php:408
#, php-format
msgid "Please visit %s to approve or reject the connection request."
msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
-#: ../../Zotlabs/Lib/Enotify.php:398
+#: ../../Zotlabs/Lib/Enotify.php:415
msgid "[$Projectname:Notify] Friend suggestion received"
msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"
-#: ../../Zotlabs/Lib/Enotify.php:399
+#: ../../Zotlabs/Lib/Enotify.php:416
#, php-format
msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
-#: ../../Zotlabs/Lib/Enotify.php:400
+#: ../../Zotlabs/Lib/Enotify.php:417
#, php-format
msgid ""
"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
"%4$s."
msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
-#: ../../Zotlabs/Lib/Enotify.php:406
+#: ../../Zotlabs/Lib/Enotify.php:423
msgid "Name:"
msgstr "Name:"
-#: ../../Zotlabs/Lib/Enotify.php:407
+#: ../../Zotlabs/Lib/Enotify.php:424
msgid "Photo:"
msgstr "Foto:"
-#: ../../Zotlabs/Lib/Enotify.php:410
+#: ../../Zotlabs/Lib/Enotify.php:427
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
-#: ../../Zotlabs/Lib/Enotify.php:629
+#: ../../Zotlabs/Lib/Enotify.php:647
msgid "[$Projectname:Notify]"
msgstr "[$Projectname:Benachrichtigung]"
-#: ../../Zotlabs/Lib/Enotify.php:793
+#: ../../Zotlabs/Lib/Enotify.php:815
msgid "created a new post"
msgstr "Neuer Beitrag wurde erzeugt"
-#: ../../Zotlabs/Lib/Enotify.php:794
+#: ../../Zotlabs/Lib/Enotify.php:816
#, php-format
msgid "commented on %s's post"
msgstr "hat %s's Beitrag kommentiert"
+#: ../../Zotlabs/Lib/Enotify.php:823
+#, php-format
+msgid "edited a post dated %s"
+msgstr "hat einen Beitrag vom %s bearbeitet"
+
+#: ../../Zotlabs/Lib/Enotify.php:827
+#, php-format
+msgid "edited a comment dated %s"
+msgstr "hat einen Kommentar vom %s bearbeitet"
+
#: ../../Zotlabs/Lib/NativeWiki.php:151
msgid "Wiki updated successfully"
msgstr "Wiki erfolgreich aktualisiert"
@@ -7976,12 +8202,12 @@ msgstr "Wiki erfolgreich aktualisiert"
msgid "Wiki files deleted successfully"
msgstr "Wiki-Dateien erfolgreich gelöscht"
-#: ../../Zotlabs/Lib/DB_Upgrade.php:95
+#: ../../Zotlabs/Lib/DB_Upgrade.php:83
#, php-format
msgid "Update Error at %s"
msgstr "Aktualisierungsfehler auf %s"
-#: ../../Zotlabs/Lib/DB_Upgrade.php:101
+#: ../../Zotlabs/Lib/DB_Upgrade.php:89
#, php-format
msgid "Update %s failed. See error logs."
msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
@@ -8046,11 +8272,11 @@ msgstr "Signatur nicht korrekt"
msgid "Add Tag"
msgstr "Tag hinzufügen"
-#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:506
+#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510
msgid "like"
msgstr "mag"
-#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:507
+#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511
msgid "dislike"
msgstr "verurteile"
@@ -8143,51 +8369,51 @@ msgstr "Dies ist eine nicht gespeicherte Vorschau"
msgid "%s show all"
msgstr "%s mehr anzeigen"
-#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1377
+#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377
msgid "Bold"
msgstr "Fett"
-#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1378
+#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378
msgid "Italic"
msgstr "Kursiv"
-#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1379
+#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379
msgid "Underline"
msgstr "Unterstrichen"
-#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1380
+#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380
msgid "Quote"
msgstr "Zitat"
-#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1381
+#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381
msgid "Code"
msgstr "Code"
-#: ../../Zotlabs/Lib/ThreadItem.php:760
+#: ../../Zotlabs/Lib/ThreadItem.php:756
msgid "Image"
msgstr "Bild"
-#: ../../Zotlabs/Lib/ThreadItem.php:761
+#: ../../Zotlabs/Lib/ThreadItem.php:757
msgid "Attach File"
msgstr "Datei anhängen"
-#: ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../Zotlabs/Lib/ThreadItem.php:758
msgid "Insert Link"
msgstr "Link einfügen"
-#: ../../Zotlabs/Lib/ThreadItem.php:763
+#: ../../Zotlabs/Lib/ThreadItem.php:759
msgid "Video"
msgstr "Video"
-#: ../../Zotlabs/Lib/ThreadItem.php:773
+#: ../../Zotlabs/Lib/ThreadItem.php:769
msgid "Your full name (required)"
msgstr "Ihr vollständiger Name (erforderlich)"
-#: ../../Zotlabs/Lib/ThreadItem.php:774
+#: ../../Zotlabs/Lib/ThreadItem.php:770
msgid "Your email address (required)"
msgstr "Ihre E-Mail-Adresse (erforderlich)"
-#: ../../Zotlabs/Lib/ThreadItem.php:775
+#: ../../Zotlabs/Lib/ThreadItem.php:771
msgid "Your website URL (optional)"
msgstr "Ihre Webseiten-URL (optional)"
@@ -8203,11 +8429,11 @@ msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angeme
msgid "Welcome %s. Remote authentication successful."
msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:284
+#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287
msgid "parent"
msgstr "Übergeordnetes Verzeichnis"
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2707
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821
msgid "Collection"
msgstr "Sammlung"
@@ -8219,8 +8445,8 @@ msgstr "Prinzipal"
msgid "Addressbook"
msgstr "Adressbuch"
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:452
-#: ../../include/nav.php:455
+#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420
+#: ../../include/nav.php:423
msgid "Calendar"
msgstr "Kalender"
@@ -8232,41 +8458,41 @@ msgstr "Posteingang für überwachte Kalender"
msgid "Schedule Outbox"
msgstr "Postausgang für überwachte Kalender"
-#: ../../Zotlabs/Storage/Browser.php:270
+#: ../../Zotlabs/Storage/Browser.php:273
msgid "Total"
msgstr "Summe"
-#: ../../Zotlabs/Storage/Browser.php:272
+#: ../../Zotlabs/Storage/Browser.php:275
msgid "Shared"
msgstr "Geteilt"
-#: ../../Zotlabs/Storage/Browser.php:350
+#: ../../Zotlabs/Storage/Browser.php:353
#, php-format
msgid "You are using %1$s of your available file storage."
msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
-#: ../../Zotlabs/Storage/Browser.php:355
+#: ../../Zotlabs/Storage/Browser.php:358
#, php-format
msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s&#37;)"
-#: ../../Zotlabs/Storage/Browser.php:366
+#: ../../Zotlabs/Storage/Browser.php:369
msgid "WARNING:"
msgstr "WARNUNG:"
-#: ../../Zotlabs/Storage/Browser.php:378
+#: ../../Zotlabs/Storage/Browser.php:381
msgid "Create new folder"
msgstr "Neuen Ordner anlegen"
-#: ../../Zotlabs/Storage/Browser.php:380
+#: ../../Zotlabs/Storage/Browser.php:383
msgid "Upload file"
msgstr "Datei hochladen"
-#: ../../Zotlabs/Storage/Browser.php:393
+#: ../../Zotlabs/Storage/Browser.php:396
msgid "Drop files here to immediately upload"
msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
-#: ../../Zotlabs/Widget/Forums.php:99
+#: ../../Zotlabs/Widget/Forums.php:100
msgid "Forums"
msgstr "Foren"
@@ -8349,8 +8575,8 @@ msgstr "Adressbuch zum Hineinimportieren auswählen"
#: ../../Zotlabs/Widget/Appcategories.php:40
#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97
#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186
-#: ../../include/taxonomy.php:337 ../../include/taxonomy.php:419
-#: ../../include/taxonomy.php:439 ../../include/taxonomy.php:460
+#: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426
+#: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467
msgid "Categories"
msgstr "Kategorien"
@@ -8392,21 +8618,21 @@ msgstr "Private Nachrichten"
msgid "Combined View"
msgstr "Kombinierte Anzeige"
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:126
+#: ../../Zotlabs/Widget/Mailmenu.php:20
msgid "Inbox"
msgstr "Eingang"
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:127
+#: ../../Zotlabs/Widget/Mailmenu.php:25
msgid "Outbox"
msgstr "Ausgang"
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:128
+#: ../../Zotlabs/Widget/Mailmenu.php:30
msgid "New Message"
msgstr "Neue Nachricht"
#: ../../Zotlabs/Widget/Chatroom_list.php:16
#: ../../include/conversation.php:1864 ../../include/conversation.php:1867
-#: ../../include/nav.php:466 ../../include/nav.php:469
+#: ../../include/nav.php:434 ../../include/nav.php:437
msgid "Chatrooms"
msgstr "Chaträume"
@@ -8488,7 +8714,7 @@ msgstr "Foto/Bild"
msgid "Remove term"
msgstr "Eintrag löschen"
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:316
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354
msgid "Saved Searches"
msgstr "Gespeicherte Suchanfragen"
@@ -8513,7 +8739,7 @@ msgstr "Wikiseiten"
msgid "Page name"
msgstr "Seitenname"
-#: ../../Zotlabs/Widget/Affinity.php:49
+#: ../../Zotlabs/Widget/Affinity.php:45
msgid "Refresh"
msgstr "Aktualisieren"
@@ -8530,7 +8756,7 @@ msgid "See more..."
msgstr "Mehr anzeigen …"
#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:414
+#: ../../include/features.php:443
msgid "Saved Folders"
msgstr "Gespeicherte Ordner"
@@ -8538,6 +8764,54 @@ msgstr "Gespeicherte Ordner"
msgid "Click to show more"
msgstr "Klick, um mehr anzuzeigen"
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "Profile Creation"
+msgstr "Profilerstellung"
+
+#: ../../Zotlabs/Widget/Newmember.php:35
+msgid "Upload profile photo"
+msgstr "Profilfoto hochladen"
+
+#: ../../Zotlabs/Widget/Newmember.php:36
+msgid "Upload cover photo"
+msgstr "Titelbild hochladen"
+
+#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119
+msgid "Edit your profile"
+msgstr "Profil bearbeiten"
+
+#: ../../Zotlabs/Widget/Newmember.php:40
+msgid "Find and Connect with others"
+msgstr "Finden und Verbinden von/mit Anderen"
+
+#: ../../Zotlabs/Widget/Newmember.php:44
+msgid "Manage your connections"
+msgstr "Deine Verbindungen verwalten"
+
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "Communicate"
+msgstr "Kommunizieren"
+
+#: ../../Zotlabs/Widget/Newmember.php:49
+msgid "View your channel homepage"
+msgstr "Deine Kanal-Startseite ansehen"
+
+#: ../../Zotlabs/Widget/Newmember.php:50
+msgid "View your network stream"
+msgstr "Deine Netzwerk-Aktivitäten ansehen"
+
+#: ../../Zotlabs/Widget/Newmember.php:56
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../../Zotlabs/Widget/Newmember.php:67
+msgid "View public stream. Warning: not moderated"
+msgstr "Öffentliche Beitragsaktivitäten ansehen. Warnung: Diese Inhalte sind nicht moderiert."
+
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "New Member Links"
+msgstr "Links für neue Mitglieder"
+
#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
msgid "Member registrations waiting for confirmation"
msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
@@ -8550,7 +8824,7 @@ msgstr "Warteschlange kontrollieren"
msgid "DB updates"
msgstr "DB-Aktualisierungen"
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:231
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199
msgid "Admin"
msgstr "Administration"
@@ -8571,8 +8845,8 @@ msgid "Additional features"
msgstr "Zusätzliche Funktionen"
#: ../../Zotlabs/Widget/Settings_menu.php:57
-msgid "Feature/Addon settings"
-msgstr "Plugin-Einstellungen"
+msgid "Addon settings"
+msgstr "Addon-Einstellungen"
#: ../../Zotlabs/Widget/Settings_menu.php:63
msgid "Display settings"
@@ -8590,7 +8864,7 @@ msgstr "Kanal exportieren"
msgid "Connected apps"
msgstr "Verbundene Apps"
-#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168
+#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231
msgid "Permission Groups"
msgstr "Berechtigungsrollen"
@@ -8610,7 +8884,7 @@ msgstr "Neue Netzwerk-Aktivitäten"
msgid "New Network Activity Notifications"
msgstr "Benachrichtigungen für neue Netzwerk-Aktivitäten"
-#: ../../Zotlabs/Widget/Notifications.php:20 ../../include/nav.php:106
+#: ../../Zotlabs/Widget/Notifications.php:20
msgid "View your network activity"
msgstr "Zeige Deine Netzwerk-Aktivitäten"
@@ -8619,161 +8893,163 @@ msgid "Mark all notifications read"
msgstr "Alle Benachrichtigungen als gesehen markieren"
#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:44
-#: ../../Zotlabs/Widget/Notifications.php:139
+#: ../../Zotlabs/Widget/Notifications.php:45
+#: ../../Zotlabs/Widget/Notifications.php:141
msgid "Show new posts only"
msgstr "Zeige nur neue Beiträge"
-#: ../../Zotlabs/Widget/Notifications.php:34
+#: ../../Zotlabs/Widget/Notifications.php:27
+#: ../../Zotlabs/Widget/Notifications.php:46
+#: ../../Zotlabs/Widget/Notifications.php:142
+msgid "Filter by name"
+msgstr "Nach Namen filtern"
+
+#: ../../Zotlabs/Widget/Notifications.php:35
msgid "New Home Activity"
msgstr "Neue Kanal-Aktivitäten"
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Zotlabs/Widget/Notifications.php:36
msgid "New Home Activity Notifications"
msgstr "Benachrichtigungen für neue Kanal-Aktivitäten"
-#: ../../Zotlabs/Widget/Notifications.php:38
+#: ../../Zotlabs/Widget/Notifications.php:39
msgid "View your home activity"
msgstr "Zeige Deine Kanal-Aktivitäten"
-#: ../../Zotlabs/Widget/Notifications.php:41
-#: ../../Zotlabs/Widget/Notifications.php:136
+#: ../../Zotlabs/Widget/Notifications.php:42
+#: ../../Zotlabs/Widget/Notifications.php:138
msgid "Mark all notifications seen"
msgstr "Alle Benachrichtigungen als gesehen markieren"
-#: ../../Zotlabs/Widget/Notifications.php:52
+#: ../../Zotlabs/Widget/Notifications.php:54
msgid "New Mails"
msgstr "Neue Mails"
-#: ../../Zotlabs/Widget/Notifications.php:53
+#: ../../Zotlabs/Widget/Notifications.php:55
msgid "New Mails Notifications"
msgstr "Benachrichtigungen für neue Mails"
-#: ../../Zotlabs/Widget/Notifications.php:56
+#: ../../Zotlabs/Widget/Notifications.php:58
msgid "View your private mails"
msgstr "Zeige Deine persönlichen Mails"
-#: ../../Zotlabs/Widget/Notifications.php:59
+#: ../../Zotlabs/Widget/Notifications.php:61
msgid "Mark all messages seen"
msgstr "Alle Mails als gelesen markieren"
-#: ../../Zotlabs/Widget/Notifications.php:67
+#: ../../Zotlabs/Widget/Notifications.php:69
msgid "New Events"
msgstr "Neue Termine"
-#: ../../Zotlabs/Widget/Notifications.php:68
+#: ../../Zotlabs/Widget/Notifications.php:70
msgid "New Events Notifications"
msgstr "Benachrichtigungen für neue Termine"
-#: ../../Zotlabs/Widget/Notifications.php:71 ../../include/nav.php:132
+#: ../../Zotlabs/Widget/Notifications.php:73
msgid "View events"
msgstr "Termine ansehen"
-#: ../../Zotlabs/Widget/Notifications.php:74 ../../include/nav.php:133
+#: ../../Zotlabs/Widget/Notifications.php:76
msgid "Mark all events seen"
msgstr "Markiere alle Termine als gesehen"
-#: ../../Zotlabs/Widget/Notifications.php:83
+#: ../../Zotlabs/Widget/Notifications.php:85
msgid "New Connections Notifications"
msgstr "Benachrichtigungen für neue Verbindungen"
-#: ../../Zotlabs/Widget/Notifications.php:86
+#: ../../Zotlabs/Widget/Notifications.php:88
msgid "View all connections"
msgstr "Zeige alle Verbindungen"
-#: ../../Zotlabs/Widget/Notifications.php:94
+#: ../../Zotlabs/Widget/Notifications.php:96
msgid "New Files"
msgstr "Neue Dateien"
-#: ../../Zotlabs/Widget/Notifications.php:95
+#: ../../Zotlabs/Widget/Notifications.php:97
msgid "New Files Notifications"
msgstr "Benachrichtigungen für neue Dateien"
-#: ../../Zotlabs/Widget/Notifications.php:102
-#: ../../Zotlabs/Widget/Notifications.php:103 ../../include/nav.php:119
+#: ../../Zotlabs/Widget/Notifications.php:104
+#: ../../Zotlabs/Widget/Notifications.php:105
msgid "Notices"
msgstr "Benachrichtigungen"
-#: ../../Zotlabs/Widget/Notifications.php:106
+#: ../../Zotlabs/Widget/Notifications.php:108
msgid "View all notices"
msgstr "Alle Notizen ansehen"
-#: ../../Zotlabs/Widget/Notifications.php:109
+#: ../../Zotlabs/Widget/Notifications.php:111
msgid "Mark all notices seen"
msgstr "Alle Notizen als gesehen markieren"
-#: ../../Zotlabs/Widget/Notifications.php:119
+#: ../../Zotlabs/Widget/Notifications.php:121
msgid "New Registrations"
msgstr "Neue Registrierungen"
-#: ../../Zotlabs/Widget/Notifications.php:120
+#: ../../Zotlabs/Widget/Notifications.php:122
msgid "New Registrations Notifications"
msgstr "Benachrichtigungen für neue Registrierungen"
-#: ../../Zotlabs/Widget/Notifications.php:130
+#: ../../Zotlabs/Widget/Notifications.php:132
msgid "Public Stream Notifications"
msgstr "Benachrichtigungen für öffentlichen Beitrags-Stream"
-#: ../../Zotlabs/Widget/Notifications.php:133
+#: ../../Zotlabs/Widget/Notifications.php:135
msgid "View the public stream"
msgstr "Zeige öffentlichen Beitrags-Stream"
-#: ../../Zotlabs/Widget/Notifications.php:147 ../../include/nav.php:316
-msgid "Loading"
-msgstr "Lädt..."
+#: ../../Zotlabs/Widget/Notifications.php:150
+msgid "Sorry, you have got no notifications at the moment"
+msgstr "Du hast momentan keine Benachrichtigungen"
#: ../../util/nconfig.php:34
msgid "Source channel not found."
msgstr "Quellkanal nicht gefunden."
-#: ../../boot.php:1644
+#: ../../boot.php:1562
msgid "Create an account to access services and applications"
msgstr "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können."
-#: ../../boot.php:1663 ../../include/nav.php:145 ../../include/nav.php:174
-#: ../../include/nav.php:191
+#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140
+#: ../../include/nav.php:159
msgid "Logout"
msgstr "Abmelden"
-#: ../../boot.php:1667
+#: ../../boot.php:1585
msgid "Login/Email"
msgstr "Anmelden/E-Mail"
-#: ../../boot.php:1668
+#: ../../boot.php:1586
msgid "Password"
msgstr "Kennwort"
-#: ../../boot.php:1669
+#: ../../boot.php:1587
msgid "Remember me"
msgstr "Angaben speichern"
-#: ../../boot.php:1672
+#: ../../boot.php:1590
msgid "Forgot your password?"
msgstr "Passwort vergessen?"
-#: ../../boot.php:2257
-msgid "toggle mobile"
-msgstr "auf/von mobile Ansicht wechseln"
-
-#: ../../boot.php:2419
+#: ../../boot.php:2347
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr "[$Projectname] Webseiten-SSL-Fehler für %s"
-#: ../../boot.php:2424
+#: ../../boot.php:2352
msgid "Website SSL certificate is not valid. Please correct."
msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
-#: ../../boot.php:2540
+#: ../../boot.php:2468
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr "[$Projectname] Cron-Jobs laufen nicht auf %s"
-#: ../../boot.php:2545
+#: ../../boot.php:2473
msgid "Cron/Scheduled tasks not running."
msgstr "Cron-Aufgaben laufen nicht."
-#: ../../boot.php:2546 ../../include/datetime.php:292
+#: ../../boot.php:2474 ../../include/datetime.php:232
msgid "never"
msgstr "Nie"
@@ -8898,7 +9174,7 @@ msgid "Errors encountered deleting database table "
msgstr "Beim Löschen der Datenbanktabelle sind Fehler aufgetreten."
#: ../../addon/rendezvous/rendezvous.php:95
-#: ../../addon/twitter/twitter.php:773
+#: ../../addon/twitter/twitter.php:779
msgid "Submit Settings"
msgstr "Einstellungen absenden"
@@ -9101,7 +9377,7 @@ msgid "Page to load after image selection."
msgstr "Die Seite, die nach Auswahl eines Bildes geladen werden soll."
#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301
-#: ../../include/nav.php:153
+#: ../../include/nav.php:119
msgid "Edit Profile"
msgstr "Profil bearbeiten"
@@ -9158,6 +9434,11 @@ msgstr "Hochgeladen von: "
msgid "Drawn by: "
msgstr "Gezeichnet von: "
+#: ../../addon/openclipatar/openclipatar.php:182
+#: ../../addon/openclipatar/openclipatar.php:194
+msgid "Use this image"
+msgstr ""
+
#: ../../addon/openclipatar/openclipatar.php:192
msgid "Or select from a free OpenClipart.org image:"
msgstr "Oder wähle ein freies Bild von OpenClipart.org:"
@@ -9174,10 +9455,6 @@ msgstr "Unbekannter Fehler. Bitte versuchen Sie es später erneut."
msgid "Profile photo updated successfully."
msgstr "Profilfoto erfolgreich aktualisiert."
-#: ../../addon/zotvi/zot6.php:25 ../../include/zot.php:4051
-msgid "invalid target signature"
-msgstr "Ungültige Signatur des Ziels"
-
#: ../../addon/adultphotoflag/adultphotoflag.php:24
msgid "Flag Adult Photos"
msgstr "Nicht jugendfreie Fotos markieren"
@@ -9274,7 +9551,7 @@ msgstr "NSFW-Einstellungen gespeichert."
msgid "Possible adult content"
msgstr "Möglicherweise nicht jugendfreie Inhalte"
-#: ../../addon/nsfw/nsfw.php:211
+#: ../../addon/nsfw/nsfw.php:222
#, php-format
msgid "%s - view"
msgstr "%s - ansehen"
@@ -9331,6 +9608,15 @@ msgstr "Standardmäßig auf auf Dreamwidth posten"
msgid "Dreamwidth Post Settings"
msgstr "Dreamwidth-Beitragseinstellungen"
+#: ../../addon/notifyadmin/notifyadmin.php:34
+msgid "New registration"
+msgstr ""
+
+#: ../../addon/notifyadmin/notifyadmin.php:42
+#, php-format
+msgid "Message sent to %s. New account registration: %s"
+msgstr "Nachricht gesendet an %s. Neue Kontoregistrierung: %s"
+
#: ../../addon/dirstats/dirstats.php:94
msgid "Hubzilla Directory Stats"
msgstr "Hubzilla-Verzeichnisstatistiken"
@@ -9579,17 +9865,17 @@ msgstr "Geburtsdatum"
msgid "OpenID protocol error. No ID returned."
msgstr "OpenID-Protokollfehler. Keine Kennung zurückgegeben."
-#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:289
+#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:290
msgid "Login failed."
msgstr "Login fehlgeschlagen."
#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1480
+#: ../../include/selectors.php:66 ../../include/channel.php:1481
msgid "Male"
msgstr "Männlich"
#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1478
+#: ../../include/selectors.php:66 ../../include/channel.php:1479
msgid "Female"
msgstr "Weiblich"
@@ -9690,11 +9976,11 @@ msgstr "verlockt"
#: ../../addon/morepokes/morepokes.php:27
msgid "raise eyebrows at"
-msgstr ""
+msgstr "Augenbrauen hochziehen"
#: ../../addon/morepokes/morepokes.php:27
msgid "raised their eyebrows at"
-msgstr ""
+msgstr "zog die Augenbrauen hoch"
#: ../../addon/morepokes/morepokes.php:28
msgid "insult"
@@ -9770,45 +10056,45 @@ msgstr ""
#: ../../addon/morepokes/morepokes.php:37
msgid "declare undying love for"
-msgstr ""
+msgstr "erkläre unsterbliche Liebe"
#: ../../addon/morepokes/morepokes.php:37
msgid "declared undying love for"
-msgstr ""
+msgstr "erklärte unsterbliche Liebe"
-#: ../../addon/diaspora/diaspora.php:772
+#: ../../addon/diaspora/diaspora.php:778
msgid "Diaspora Protocol Settings updated."
msgstr "Diaspora Protokoll Einstellungen aktualisiert"
-#: ../../addon/diaspora/diaspora.php:791
+#: ../../addon/diaspora/diaspora.php:797
msgid ""
"The Diaspora protocol does not support location independence. Connections "
"you make within that network may be unreachable from alternate channel "
"locations."
msgstr "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein."
-#: ../../addon/diaspora/diaspora.php:794
+#: ../../addon/diaspora/diaspora.php:800
msgid "Enable the Diaspora protocol for this channel"
msgstr "Das Diaspora Protokoll für diesen Kanal aktivieren"
-#: ../../addon/diaspora/diaspora.php:798
+#: ../../addon/diaspora/diaspora.php:804
msgid "Allow any Diaspora member to comment on your public posts"
msgstr "Erlaube jedem Diaspora Nutzer deine öffentlichen Beiträge zu kommentieren"
-#: ../../addon/diaspora/diaspora.php:802
+#: ../../addon/diaspora/diaspora.php:808
msgid "Prevent your hashtags from being redirected to other sites"
msgstr "Verhindern, dass Deine Hashtags zu anderen Seiten umgeleitet werden"
-#: ../../addon/diaspora/diaspora.php:806
+#: ../../addon/diaspora/diaspora.php:812
msgid ""
"Sign and forward posts and comments with no existing Diaspora signature"
msgstr "Signieren und Weiterleiten von Beiträgen und Kommentaren ohne vorhandene Diaspora-Signatur"
-#: ../../addon/diaspora/diaspora.php:811
+#: ../../addon/diaspora/diaspora.php:817
msgid "Followed hashtags (comma separated, do not include the #)"
msgstr "Verfolgte Hashtags (Komma separierte Liste, ohne die #)"
-#: ../../addon/diaspora/diaspora.php:816
+#: ../../addon/diaspora/diaspora.php:822
msgid "Diaspora Protocol Settings"
msgstr "Diaspora Protokoll Einstellungen"
@@ -9823,11 +10109,11 @@ msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Im
#: ../../addon/testdrive/testdrive.php:104
#, php-format
msgid "Your account on %s will expire in a few days."
-msgstr "Dein Account auf %s wird in ein paar Tagen ablaufen."
+msgstr "Dein Konto auf %s wird in ein paar Tagen ablaufen."
#: ../../addon/testdrive/testdrive.php:105
msgid "Your $Productname test account is about to expire."
-msgstr "Dein $Productname Test-Account wird bald auslaufen."
+msgstr "Dein $Productname Test-Konto wird bald auslaufen."
#: ../../addon/rainbowtag/rainbowtag.php:81
msgid "Enable Rainbowtag"
@@ -9919,15 +10205,15 @@ msgstr "Gravatar-Einstellungen aktualisiert."
#: ../../addon/hzfiles/hzfiles.php:79
msgid "Hubzilla File Storage Import"
-msgstr ""
+msgstr "Hubzilla-Datenspeicher-Import"
#: ../../addon/hzfiles/hzfiles.php:80
msgid "This will import all your cloud files from another server."
-msgstr ""
+msgstr "Hiermit werden alle Deine Cloud-Dateien von einem anderen Server importiert."
#: ../../addon/hzfiles/hzfiles.php:81
msgid "Hubzilla Server base URL"
-msgstr ""
+msgstr "Basis-URL des Habzilla-Servers"
#: ../../addon/hzfiles/hzfiles.php:82
msgid "Since modified date yyyy-mm-dd"
@@ -10002,6 +10288,10 @@ msgstr "Mail Test"
msgid "Message subject"
msgstr "Betreff der Nachricht"
+#: ../../addon/mdpost/mdpost.php:41
+msgid "Use markdown for editing posts"
+msgstr "Verwende Markdown zum Bearbeiten von Beiträgen"
+
#: ../../addon/openstreetmap/openstreetmap.php:146
msgid "View Larger"
msgstr "Größer anzeigen"
@@ -10084,7 +10374,7 @@ msgid "Hubzilla to Friendica Post Settings"
msgstr "Hubzilla-zu-Friendica Beitragseinstellungen"
#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397
-#: ../../include/channel.php:1567
+#: ../../include/channel.php:1568
msgid "Status:"
msgstr "Status:"
@@ -10211,7 +10501,7 @@ msgstr "Hubzilla-Kanalname"
#: ../../addon/redred/redred.php:119
msgid "Hubzilla Crosspost Settings"
-msgstr ""
+msgstr "Hubzilla Crosspost Einstellungen"
#: ../../addon/logrot/logrot.php:36
msgid "Logfile archive directory"
@@ -10249,37 +10539,37 @@ msgstr "Friendica-Anmeldebenutzername"
msgid "Friendica Login Password"
msgstr "Friendica-Anmeldepasswort"
-#: ../../addon/pubcrawl/as.php:1077 ../../addon/pubcrawl/as.php:1164
-#: ../../addon/pubcrawl/as.php:1339 ../../include/network.php:1768
+#: ../../addon/pubcrawl/as.php:1101 ../../addon/pubcrawl/as.php:1228
+#: ../../addon/pubcrawl/as.php:1403 ../../include/network.php:1774
msgid "ActivityPub"
msgstr "ActivityPub"
-#: ../../addon/pubcrawl/pubcrawl.php:1033
+#: ../../addon/pubcrawl/pubcrawl.php:1034
msgid "ActivityPub Protocol Settings updated."
-msgstr ""
+msgstr "ActivityPub Protokoll Einstellungen aktualisiert"
-#: ../../addon/pubcrawl/pubcrawl.php:1042
+#: ../../addon/pubcrawl/pubcrawl.php:1043
msgid ""
"The ActivityPub protocol does not support location independence. Connections"
" you make within that network may be unreachable from alternate channel "
"locations."
msgstr ""
-#: ../../addon/pubcrawl/pubcrawl.php:1045
+#: ../../addon/pubcrawl/pubcrawl.php:1046
msgid "Enable the ActivityPub protocol for this channel"
-msgstr ""
+msgstr "Aktiviere das ActivityPub Protokoll für diesen Kanal"
-#: ../../addon/pubcrawl/pubcrawl.php:1048
+#: ../../addon/pubcrawl/pubcrawl.php:1049
msgid "Send multi-media HTML articles"
-msgstr ""
+msgstr "Multimedia HTML Artikel versenden"
-#: ../../addon/pubcrawl/pubcrawl.php:1048
+#: ../../addon/pubcrawl/pubcrawl.php:1049
msgid "Not supported by some microblog services such as Mastodon"
-msgstr ""
+msgstr "Wird von einigen Microblogging-Plattformen wie Mastodon nicht unterstützt"
#: ../../addon/pubcrawl/pubcrawl.php:1053
msgid "ActivityPub Protocol Settings"
-msgstr ""
+msgstr "ActivityPub Protokoll Einstellungen"
#: ../../addon/donate/donate.php:21
msgid "Project Servers and Resources"
@@ -10583,7 +10873,7 @@ msgstr "Aktuelle GNU social API ist"
msgid "Cancel GNU social Connection"
msgstr "GNU social Verbindung trennen"
-#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:232
+#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:233
msgid "Currently connected to: "
msgstr "Momentan verbunden mit:"
@@ -10603,7 +10893,7 @@ msgstr "Erlaube die Veröffentlichung bei GNU social"
msgid ""
"If enabled your public postings can be posted to the associated GNU-social "
"account"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Account veröffentlicht werden."
+msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Konto veröffentlicht werden."
#: ../../addon/statusnet/statusnet.php:415
msgid "Post to GNU social by default"
@@ -10613,9 +10903,9 @@ msgstr "Standardmäßig bei GNU social veröffentlichen"
msgid ""
"If enabled your public postings will be posted to the associated GNU-social "
"account by default"
-msgstr "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Account veröffentlicht."
+msgstr "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Konto veröffentlicht."
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:255
+#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:261
msgid "Clear OAuth configuration"
msgstr "OAuth Konfiguration löschen"
@@ -10643,39 +10933,39 @@ msgstr "QR-Generator"
msgid "Enter some text"
msgstr "Etwas Text eingeben"
-#: ../../addon/chess/chess.php:278 ../../addon/chess/chess.php:465
+#: ../../addon/chess/chess.php:353 ../../addon/chess/chess.php:542
msgid "Invalid game."
msgstr "Ungültiges Spiel."
-#: ../../addon/chess/chess.php:284 ../../addon/chess/chess.php:471
+#: ../../addon/chess/chess.php:359 ../../addon/chess/chess.php:582
msgid "You are not a player in this game."
msgstr "Sie sind kein Spieler in diesem Spiel."
-#: ../../addon/chess/chess.php:340
+#: ../../addon/chess/chess.php:415
msgid "You must be a local channel to create a game."
msgstr "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein"
-#: ../../addon/chess/chess.php:358
+#: ../../addon/chess/chess.php:433
msgid "You must select one opponent that is not yourself."
msgstr "Du musst einen Gegner wählen, der nicht du selbst ist"
-#: ../../addon/chess/chess.php:367
-msgid "You must select white or black."
-msgstr "Sie müssen weiß oder schwarz auswählen."
+#: ../../addon/chess/chess.php:444
+msgid "Random color chosen."
+msgstr ""
-#: ../../addon/chess/chess.php:375
+#: ../../addon/chess/chess.php:452
msgid "Error creating new game."
msgstr "Fehler beim Erstellen eines neuen Spiels."
-#: ../../addon/chess/chess.php:409 ../../include/channel.php:1152
+#: ../../addon/chess/chess.php:486 ../../include/channel.php:1152
msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
+msgstr "Angeforderter Kanal nicht verfügbar."
-#: ../../addon/chess/chess.php:423
+#: ../../addon/chess/chess.php:500
msgid "You must select a local channel /chess/channelname"
msgstr "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen"
-#: ../../addon/chess/chess.php:969
+#: ../../addon/chess/chess.php:1066
msgid "Enable notifications"
msgstr "Benachrichtigungen aktivieren"
@@ -10683,17 +10973,17 @@ msgstr "Benachrichtigungen aktivieren"
msgid "Post to Twitter"
msgstr "Bei Twitter veröffentlichen"
-#: ../../addon/twitter/twitter.php:154
+#: ../../addon/twitter/twitter.php:155
msgid "Twitter settings updated."
msgstr "Twitter-Einstellungen aktualisiert."
-#: ../../addon/twitter/twitter.php:183
+#: ../../addon/twitter/twitter.php:184
msgid ""
"No consumer key pair for Twitter found. Please contact your site "
"administrator."
msgstr "Es wurde kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte kontaktiere deinen Seiten-Administrator."
-#: ../../addon/twitter/twitter.php:205
+#: ../../addon/twitter/twitter.php:206
msgid ""
"At this Hubzilla instance the Twitter plugin was enabled but you have not "
"yet connected your account to your Twitter account. To do so click the "
@@ -10702,15 +10992,15 @@ msgid ""
" be posted to Twitter."
msgstr "Auf diesem Hubzilla-Server ist das Twitter-Plugin aktiviert, aber Du hast Dich hier noch nicht mit Deinem Twitter-Konto verbunden. Um dies zu tun, klicke die Schaltfläche unten, um eine PIN von Twitter zu erhalten, die Du dann in das Eingabefeld darunter einfügen und das Formular bestätigen musst. Nur Deine <strong>öffentlichen</strong> Beiträge werden auf Twitter geteilt."
-#: ../../addon/twitter/twitter.php:207
+#: ../../addon/twitter/twitter.php:208
msgid "Log in with Twitter"
msgstr "Mit Twitter anmelden"
-#: ../../addon/twitter/twitter.php:210
+#: ../../addon/twitter/twitter.php:211
msgid "Copy the PIN from Twitter here"
msgstr "PIN von Twitter hier her kopieren"
-#: ../../addon/twitter/twitter.php:237
+#: ../../addon/twitter/twitter.php:238
msgid ""
"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
"details from unknown viewers?</em>) the link potentially included in public "
@@ -10718,27 +11008,35 @@ msgid ""
"the visitor that the access to your profile has been restricted."
msgstr "<strong>Hinweis:</strong> Entsprechend Deiner Privatsphären-Einstellungen (<em>Profil-Details vor nicht angemeldeten Besuchern verbergen?</em>) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist."
-#: ../../addon/twitter/twitter.php:242
+#: ../../addon/twitter/twitter.php:243
msgid "Allow posting to Twitter"
msgstr "Erlaube die Veröffentlichung bei Twitter"
-#: ../../addon/twitter/twitter.php:242
+#: ../../addon/twitter/twitter.php:243
msgid ""
"If enabled your public postings can be posted to the associated Twitter "
"account"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
+msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden."
+
+#: ../../addon/twitter/twitter.php:247
+msgid "Twitter post length"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:247
+msgid "Maximum tweet length"
+msgstr ""
-#: ../../addon/twitter/twitter.php:246
+#: ../../addon/twitter/twitter.php:252
msgid "Send public postings to Twitter by default"
msgstr "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen"
-#: ../../addon/twitter/twitter.php:246
+#: ../../addon/twitter/twitter.php:252
msgid ""
"If enabled your public postings will be posted to the associated Twitter "
"account by default"
-msgstr "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden."
+msgstr "Wenn aktiv werden deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden."
-#: ../../addon/twitter/twitter.php:264
+#: ../../addon/twitter/twitter.php:270
msgid "Twitter Post Settings"
msgstr "Twitter-Beitragseinstellungen"
@@ -10962,8 +11260,8 @@ msgstr "Erweitertes Teilen von Identitäten"
#: ../../addon/sendzid/sendzid.php:26
msgid ""
"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
-msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Hubzilla-Servern geteilt."
+"identity is only shared with $Projectname sites."
+msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit $Projectname - Servern geteilt."
#: ../../addon/tictac/tictac.php:21
msgid "Three Dimensional Tic-Tac-Toe"
@@ -11240,7 +11538,7 @@ msgstr "Ein Konto wurde für Sie erstellt."
#: ../../addon/ldapauth/ldapauth.php:68
msgid "Authentication successful but rejected: account creation is disabled."
-msgstr "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert."
+msgstr "Authentifizierung war erfolgreich, wurde aber abgewiesen! Das Anlegen von Konten wurde deaktiviert."
#: ../../addon/opensearch/opensearch.php:26
#, php-format
@@ -11346,11 +11644,11 @@ msgstr "Transsexuell"
msgid "Hermaphrodite"
msgstr "Zwitter"
-#: ../../include/selectors.php:49 ../../include/channel.php:1484
+#: ../../include/selectors.php:49 ../../include/channel.php:1485
msgid "Neuter"
msgstr "Geschlechtslos"
-#: ../../include/selectors.php:49 ../../include/channel.php:1486
+#: ../../include/selectors.php:49 ../../include/channel.php:1487
msgid "Non-specific"
msgstr "unklar"
@@ -11533,12 +11831,12 @@ msgstr "Frag mich mal"
#: ../../include/conversation.php:169
#, php-format
msgid "likes %1$s's %2$s"
-msgstr ""
+msgstr "gefällt %1$ss %2$s"
#: ../../include/conversation.php:172
#, php-format
msgid "doesn't like %1$s's %2$s"
-msgstr ""
+msgstr "missfällt %1$ss %2$s"
#: ../../include/conversation.php:212
#, php-format
@@ -11550,8 +11848,8 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
msgid "%1$s poked %2$s"
msgstr "%1$s stupste %2$s an"
-#: ../../include/conversation.php:251 ../../include/text.php:1104
-#: ../../include/text.php:1109
+#: ../../include/conversation.php:251 ../../include/text.php:1129
+#: ../../include/text.php:1133
msgid "poked"
msgstr "stupste"
@@ -11753,32 +12051,32 @@ msgstr "Spam"
msgid "Posts flagged as SPAM"
msgstr "Nachrichten, die als SPAM markiert wurden"
-#: ../../include/conversation.php:1811 ../../include/nav.php:413
+#: ../../include/conversation.php:1811 ../../include/nav.php:381
msgid "Status Messages and Posts"
msgstr "Statusnachrichten und Beiträge"
-#: ../../include/conversation.php:1824 ../../include/nav.php:426
+#: ../../include/conversation.php:1824 ../../include/nav.php:394
msgid "Profile Details"
msgstr "Profil-Details"
-#: ../../include/conversation.php:1834 ../../include/nav.php:436
+#: ../../include/conversation.php:1834 ../../include/nav.php:404
#: ../../include/photos.php:655
msgid "Photo Albums"
msgstr "Fotoalben"
-#: ../../include/conversation.php:1842 ../../include/nav.php:444
+#: ../../include/conversation.php:1842 ../../include/nav.php:412
msgid "Files and Storage"
msgstr "Dateien und Speicher"
-#: ../../include/conversation.php:1879 ../../include/nav.php:479
+#: ../../include/conversation.php:1879 ../../include/nav.php:447
msgid "Bookmarks"
msgstr "Lesezeichen"
-#: ../../include/conversation.php:1882 ../../include/nav.php:482
+#: ../../include/conversation.php:1882 ../../include/nav.php:450
msgid "Saved Bookmarks"
msgstr "Gespeicherte Lesezeichen"
-#: ../../include/conversation.php:1893 ../../include/nav.php:493
+#: ../../include/conversation.php:1893 ../../include/nav.php:461
msgid "View Cards"
msgstr "Karten anzeigen"
@@ -11786,11 +12084,11 @@ msgstr "Karten anzeigen"
msgid "articles"
msgstr "Artikel"
-#: ../../include/conversation.php:1904 ../../include/nav.php:504
+#: ../../include/conversation.php:1904 ../../include/nav.php:472
msgid "View Articles"
msgstr "Artikel anzeigen"
-#: ../../include/conversation.php:1915 ../../include/nav.php:516
+#: ../../include/conversation.php:1915 ../../include/nav.php:484
msgid "View Webpages"
msgstr "Webseiten anzeigen"
@@ -11862,368 +12160,368 @@ msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
-#: ../../include/import.php:105
+#: ../../include/import.php:106
msgid "Cloned channel not found. Import failed."
msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
-#: ../../include/text.php:478
+#: ../../include/text.php:492
msgid "prev"
msgstr "vorherige"
-#: ../../include/text.php:480
+#: ../../include/text.php:494
msgid "first"
msgstr "erste"
-#: ../../include/text.php:509
+#: ../../include/text.php:523
msgid "last"
msgstr "letzte"
-#: ../../include/text.php:512
+#: ../../include/text.php:526
msgid "next"
msgstr "nächste"
-#: ../../include/text.php:523
+#: ../../include/text.php:537
msgid "older"
msgstr "älter"
-#: ../../include/text.php:525
+#: ../../include/text.php:539
msgid "newer"
msgstr "neuer"
-#: ../../include/text.php:947
+#: ../../include/text.php:961
msgid "No connections"
msgstr "Keine Verbindungen"
-#: ../../include/text.php:972
+#: ../../include/text.php:993
#, php-format
msgid "View all %s connections"
msgstr "Alle Verbindungen von %s anzeigen"
-#: ../../include/text.php:1104 ../../include/text.php:1109
+#: ../../include/text.php:1129 ../../include/text.php:1133
msgid "poke"
msgstr "anstupsen"
-#: ../../include/text.php:1110
+#: ../../include/text.php:1134
msgid "ping"
msgstr "anpingen"
-#: ../../include/text.php:1110
+#: ../../include/text.php:1134
msgid "pinged"
msgstr "pingte"
-#: ../../include/text.php:1111
+#: ../../include/text.php:1135
msgid "prod"
msgstr "knuffen"
-#: ../../include/text.php:1111
+#: ../../include/text.php:1135
msgid "prodded"
msgstr "knuffte"
-#: ../../include/text.php:1112
+#: ../../include/text.php:1136
msgid "slap"
msgstr "ohrfeigen"
-#: ../../include/text.php:1112
+#: ../../include/text.php:1136
msgid "slapped"
msgstr "ohrfeigte"
-#: ../../include/text.php:1113
+#: ../../include/text.php:1137
msgid "finger"
msgstr "befummeln"
-#: ../../include/text.php:1113
+#: ../../include/text.php:1137
msgid "fingered"
msgstr "befummelte"
-#: ../../include/text.php:1114
+#: ../../include/text.php:1138
msgid "rebuff"
msgstr "eine Abfuhr erteilen"
-#: ../../include/text.php:1114
+#: ../../include/text.php:1138
msgid "rebuffed"
msgstr "zurückgewiesen"
-#: ../../include/text.php:1126
+#: ../../include/text.php:1161
msgid "happy"
msgstr "glücklich"
-#: ../../include/text.php:1127
+#: ../../include/text.php:1162
msgid "sad"
msgstr "traurig"
-#: ../../include/text.php:1128
+#: ../../include/text.php:1163
msgid "mellow"
msgstr "sanft"
-#: ../../include/text.php:1129
+#: ../../include/text.php:1164
msgid "tired"
msgstr "müde"
-#: ../../include/text.php:1130
+#: ../../include/text.php:1165
msgid "perky"
msgstr "frech"
-#: ../../include/text.php:1131
+#: ../../include/text.php:1166
msgid "angry"
msgstr "sauer"
-#: ../../include/text.php:1132
+#: ../../include/text.php:1167
msgid "stupefied"
msgstr "verblüfft"
-#: ../../include/text.php:1133
+#: ../../include/text.php:1168
msgid "puzzled"
msgstr "verwirrt"
-#: ../../include/text.php:1134
+#: ../../include/text.php:1169
msgid "interested"
msgstr "interessiert"
-#: ../../include/text.php:1135
+#: ../../include/text.php:1170
msgid "bitter"
msgstr "verbittert"
-#: ../../include/text.php:1136
+#: ../../include/text.php:1171
msgid "cheerful"
msgstr "fröhlich"
-#: ../../include/text.php:1137
+#: ../../include/text.php:1172
msgid "alive"
msgstr "lebendig"
-#: ../../include/text.php:1138
+#: ../../include/text.php:1173
msgid "annoyed"
msgstr "verärgert"
-#: ../../include/text.php:1139
+#: ../../include/text.php:1174
msgid "anxious"
msgstr "unruhig"
-#: ../../include/text.php:1140
+#: ../../include/text.php:1175
msgid "cranky"
msgstr "schrullig"
-#: ../../include/text.php:1141
+#: ../../include/text.php:1176
msgid "disturbed"
msgstr "verstört"
-#: ../../include/text.php:1142
+#: ../../include/text.php:1177
msgid "frustrated"
msgstr "frustriert"
-#: ../../include/text.php:1143
+#: ../../include/text.php:1178
msgid "depressed"
msgstr "deprimiert"
-#: ../../include/text.php:1144
+#: ../../include/text.php:1179
msgid "motivated"
msgstr "motiviert"
-#: ../../include/text.php:1145
+#: ../../include/text.php:1180
msgid "relaxed"
msgstr "entspannt"
-#: ../../include/text.php:1146
+#: ../../include/text.php:1181
msgid "surprised"
msgstr "überrascht"
-#: ../../include/text.php:1320 ../../include/js_strings.php:70
+#: ../../include/text.php:1360 ../../include/js_strings.php:76
msgid "Monday"
msgstr "Montag"
-#: ../../include/text.php:1320 ../../include/js_strings.php:71
+#: ../../include/text.php:1360 ../../include/js_strings.php:77
msgid "Tuesday"
msgstr "Dienstag"
-#: ../../include/text.php:1320 ../../include/js_strings.php:72
+#: ../../include/text.php:1360 ../../include/js_strings.php:78
msgid "Wednesday"
msgstr "Mittwoch"
-#: ../../include/text.php:1320 ../../include/js_strings.php:73
+#: ../../include/text.php:1360 ../../include/js_strings.php:79
msgid "Thursday"
msgstr "Donnerstag"
-#: ../../include/text.php:1320 ../../include/js_strings.php:74
+#: ../../include/text.php:1360 ../../include/js_strings.php:80
msgid "Friday"
msgstr "Freitag"
-#: ../../include/text.php:1320 ../../include/js_strings.php:75
+#: ../../include/text.php:1360 ../../include/js_strings.php:81
msgid "Saturday"
msgstr "Samstag"
-#: ../../include/text.php:1320 ../../include/js_strings.php:69
+#: ../../include/text.php:1360 ../../include/js_strings.php:75
msgid "Sunday"
msgstr "Sonntag"
-#: ../../include/text.php:1324 ../../include/js_strings.php:45
+#: ../../include/text.php:1364 ../../include/js_strings.php:51
msgid "January"
msgstr "Januar"
-#: ../../include/text.php:1324 ../../include/js_strings.php:46
+#: ../../include/text.php:1364 ../../include/js_strings.php:52
msgid "February"
msgstr "Februar"
-#: ../../include/text.php:1324 ../../include/js_strings.php:47
+#: ../../include/text.php:1364 ../../include/js_strings.php:53
msgid "March"
msgstr "März"
-#: ../../include/text.php:1324 ../../include/js_strings.php:48
+#: ../../include/text.php:1364 ../../include/js_strings.php:54
msgid "April"
msgstr "April"
-#: ../../include/text.php:1324
+#: ../../include/text.php:1364
msgid "May"
msgstr "Mai"
-#: ../../include/text.php:1324 ../../include/js_strings.php:50
+#: ../../include/text.php:1364 ../../include/js_strings.php:56
msgid "June"
msgstr "Juni"
-#: ../../include/text.php:1324 ../../include/js_strings.php:51
+#: ../../include/text.php:1364 ../../include/js_strings.php:57
msgid "July"
msgstr "Juli"
-#: ../../include/text.php:1324 ../../include/js_strings.php:52
+#: ../../include/text.php:1364 ../../include/js_strings.php:58
msgid "August"
msgstr "August"
-#: ../../include/text.php:1324 ../../include/js_strings.php:53
+#: ../../include/text.php:1364 ../../include/js_strings.php:59
msgid "September"
msgstr "September"
-#: ../../include/text.php:1324 ../../include/js_strings.php:54
+#: ../../include/text.php:1364 ../../include/js_strings.php:60
msgid "October"
msgstr "Oktober"
-#: ../../include/text.php:1324 ../../include/js_strings.php:55
+#: ../../include/text.php:1364 ../../include/js_strings.php:61
msgid "November"
msgstr "November"
-#: ../../include/text.php:1324 ../../include/js_strings.php:56
+#: ../../include/text.php:1364 ../../include/js_strings.php:62
msgid "December"
msgstr "Dezember"
-#: ../../include/text.php:1388 ../../include/text.php:1392
+#: ../../include/text.php:1428 ../../include/text.php:1432
msgid "Unknown Attachment"
msgstr "Unbekannter Anhang"
-#: ../../include/text.php:1394 ../../include/feedutils.php:825
+#: ../../include/text.php:1434 ../../include/feedutils.php:852
msgid "unknown"
msgstr "unbekannt"
-#: ../../include/text.php:1430
+#: ../../include/text.php:1470
msgid "remove category"
msgstr "Kategorie entfernen"
-#: ../../include/text.php:1504
+#: ../../include/text.php:1544
msgid "remove from file"
msgstr "aus der Datei entfernen"
-#: ../../include/text.php:1623 ../../include/message.php:12
+#: ../../include/text.php:1686 ../../include/message.php:12
msgid "Download binary/encrypted content"
msgstr "Binären/verschlüsselten Inhalt herunterladen"
-#: ../../include/text.php:1782 ../../include/language.php:364
+#: ../../include/text.php:1848 ../../include/language.php:397
msgid "default"
msgstr "Standard"
-#: ../../include/text.php:1790
+#: ../../include/text.php:1856
msgid "Page layout"
msgstr "Seiten-Layout"
-#: ../../include/text.php:1790
+#: ../../include/text.php:1856
msgid "You can create your own with the layouts tool"
msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
-#: ../../include/text.php:1801
+#: ../../include/text.php:1867
msgid "HTML"
msgstr "HTML"
-#: ../../include/text.php:1804
+#: ../../include/text.php:1870
msgid "Comanche Layout"
msgstr "Comanche-Layout"
-#: ../../include/text.php:1809
+#: ../../include/text.php:1875
msgid "PHP"
msgstr "PHP"
-#: ../../include/text.php:1818
+#: ../../include/text.php:1884
msgid "Page content type"
msgstr "Art des Seiteninhalts"
-#: ../../include/text.php:1951
+#: ../../include/text.php:2017
msgid "activity"
msgstr "Aktivität"
-#: ../../include/text.php:2014
+#: ../../include/text.php:2099
msgid "a-z, 0-9, -, and _ only"
msgstr "nur a-z, 0-9, - und _"
-#: ../../include/text.php:2285
+#: ../../include/text.php:2399
msgid "Design Tools"
msgstr "Gestaltungswerkzeuge"
-#: ../../include/text.php:2291
+#: ../../include/text.php:2405
msgid "Pages"
msgstr "Seiten"
-#: ../../include/text.php:2313
+#: ../../include/text.php:2427
msgid "Import website..."
msgstr "Webseite importieren..."
-#: ../../include/text.php:2314
+#: ../../include/text.php:2428
msgid "Select folder to import"
msgstr "Ordner zum Importieren auswählen"
-#: ../../include/text.php:2315
+#: ../../include/text.php:2429
msgid "Import from a zipped folder:"
msgstr "Aus einem gezippten Ordner importieren:"
-#: ../../include/text.php:2316
+#: ../../include/text.php:2430
msgid "Import from cloud files:"
msgstr "Aus Cloud-Dateien importieren:"
-#: ../../include/text.php:2317
+#: ../../include/text.php:2431
msgid "/cloud/channel/path/to/folder"
msgstr "/Cloud/Kanal/Pfad/zum/Ordner"
-#: ../../include/text.php:2318
+#: ../../include/text.php:2432
msgid "Enter path to website files"
msgstr "Pfad zu Webseitendateien eingeben"
-#: ../../include/text.php:2319
+#: ../../include/text.php:2433
msgid "Select folder"
msgstr "Ordner auswählen"
-#: ../../include/text.php:2320
+#: ../../include/text.php:2434
msgid "Export website..."
msgstr "Webseite exportieren..."
-#: ../../include/text.php:2321
+#: ../../include/text.php:2435
msgid "Export to a zip file"
msgstr "In eine ZIP-Datei exportieren"
-#: ../../include/text.php:2322
+#: ../../include/text.php:2436
msgid "website.zip"
msgstr "website.zip"
-#: ../../include/text.php:2323
+#: ../../include/text.php:2437
msgid "Enter a name for the zip file."
msgstr "Geben Sie einen für die ZIP-Datei ein."
-#: ../../include/text.php:2324
+#: ../../include/text.php:2438
msgid "Export to cloud files"
msgstr "In Cloud-Dateien exportieren"
-#: ../../include/text.php:2325
+#: ../../include/text.php:2439
msgid "/path/to/export/folder"
msgstr "/Pfad/zum/exportierenden/Ordner"
-#: ../../include/text.php:2326
+#: ../../include/text.php:2440
msgid "Enter a path to a cloud files destination."
msgstr "Gib den Pfad zu einem Datei-Speicherort in der Cloud ein."
-#: ../../include/text.php:2327
+#: ../../include/text.php:2441
msgid "Specify folder"
msgstr "Ordner angeben"
@@ -12271,7 +12569,7 @@ msgstr "Gemeinsame Verbindungen"
msgid "View all %d common connections"
msgstr "Zeige alle %d gemeinsamen Verbindungen"
-#: ../../include/markdown.php:158 ../../include/bbcode.php:339
+#: ../../include/markdown.php:158 ../../include/bbcode.php:343
#, php-format
msgid "%1$s wrote the following %2$s %3$s"
msgstr "%1$s schrieb den folgenden %2$s %3$s"
@@ -12375,182 +12673,182 @@ msgstr "Gib eine URL ein:"
msgid "Unsaved changes. Are you sure you wish to leave this page?"
msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?"
-#: ../../include/js_strings.php:27
+#: ../../include/js_strings.php:31
msgid "timeago.prefixAgo"
msgstr "vor"
-#: ../../include/js_strings.php:28
+#: ../../include/js_strings.php:32
msgid "timeago.prefixFromNow"
msgstr "in"
-#: ../../include/js_strings.php:29
+#: ../../include/js_strings.php:33
msgid "timeago.suffixAgo"
msgstr "NONE"
-#: ../../include/js_strings.php:30
+#: ../../include/js_strings.php:34
msgid "timeago.suffixFromNow"
msgstr "NONE"
-#: ../../include/js_strings.php:31
+#: ../../include/js_strings.php:37
msgid "less than a minute"
msgstr "weniger als einer Minute"
-#: ../../include/js_strings.php:32
+#: ../../include/js_strings.php:38
msgid "about a minute"
msgstr "ungefähr einer Minute"
-#: ../../include/js_strings.php:33
+#: ../../include/js_strings.php:39
#, php-format
msgid "%d minutes"
msgstr "%d Minuten"
-#: ../../include/js_strings.php:34
+#: ../../include/js_strings.php:40
msgid "about an hour"
msgstr "ungefähr einer Stunde"
-#: ../../include/js_strings.php:35
+#: ../../include/js_strings.php:41
#, php-format
msgid "about %d hours"
msgstr "ungefähr %d Stunden"
-#: ../../include/js_strings.php:36
+#: ../../include/js_strings.php:42
msgid "a day"
msgstr "einem Tag"
-#: ../../include/js_strings.php:37
+#: ../../include/js_strings.php:43
#, php-format
msgid "%d days"
msgstr "%d Tagen"
-#: ../../include/js_strings.php:38
+#: ../../include/js_strings.php:44
msgid "about a month"
msgstr "ungefähr einem Monat"
-#: ../../include/js_strings.php:39
+#: ../../include/js_strings.php:45
#, php-format
msgid "%d months"
msgstr "%d Monaten"
-#: ../../include/js_strings.php:40
+#: ../../include/js_strings.php:46
msgid "about a year"
msgstr "ungefähr einem Jahr"
-#: ../../include/js_strings.php:41
+#: ../../include/js_strings.php:47
#, php-format
msgid "%d years"
msgstr "%d Jahren"
-#: ../../include/js_strings.php:42
+#: ../../include/js_strings.php:48
msgid " "
msgstr " "
-#: ../../include/js_strings.php:43
+#: ../../include/js_strings.php:49
msgid "timeago.numbers"
msgstr "timeago.numbers"
-#: ../../include/js_strings.php:49
+#: ../../include/js_strings.php:55
msgctxt "long"
msgid "May"
msgstr "Mai"
-#: ../../include/js_strings.php:57
+#: ../../include/js_strings.php:63
msgid "Jan"
msgstr "Jan"
-#: ../../include/js_strings.php:58
+#: ../../include/js_strings.php:64
msgid "Feb"
msgstr "Feb"
-#: ../../include/js_strings.php:59
+#: ../../include/js_strings.php:65
msgid "Mar"
msgstr "Mär"
-#: ../../include/js_strings.php:60
+#: ../../include/js_strings.php:66
msgid "Apr"
msgstr "Apr"
-#: ../../include/js_strings.php:61
+#: ../../include/js_strings.php:67
msgctxt "short"
msgid "May"
msgstr "Mai"
-#: ../../include/js_strings.php:62
+#: ../../include/js_strings.php:68
msgid "Jun"
msgstr "Jun"
-#: ../../include/js_strings.php:63
+#: ../../include/js_strings.php:69
msgid "Jul"
msgstr "Jul"
-#: ../../include/js_strings.php:64
+#: ../../include/js_strings.php:70
msgid "Aug"
msgstr "Aug"
-#: ../../include/js_strings.php:65
+#: ../../include/js_strings.php:71
msgid "Sep"
msgstr "Sep"
-#: ../../include/js_strings.php:66
+#: ../../include/js_strings.php:72
msgid "Oct"
msgstr "Okt"
-#: ../../include/js_strings.php:67
+#: ../../include/js_strings.php:73
msgid "Nov"
msgstr "Nov"
-#: ../../include/js_strings.php:68
+#: ../../include/js_strings.php:74
msgid "Dec"
msgstr "Dez"
-#: ../../include/js_strings.php:76
+#: ../../include/js_strings.php:82
msgid "Sun"
msgstr "So"
-#: ../../include/js_strings.php:77
+#: ../../include/js_strings.php:83
msgid "Mon"
msgstr "Mo"
-#: ../../include/js_strings.php:78
+#: ../../include/js_strings.php:84
msgid "Tue"
msgstr "Di"
-#: ../../include/js_strings.php:79
+#: ../../include/js_strings.php:85
msgid "Wed"
msgstr "Mi"
-#: ../../include/js_strings.php:80
+#: ../../include/js_strings.php:86
msgid "Thu"
msgstr "Do"
-#: ../../include/js_strings.php:81
+#: ../../include/js_strings.php:87
msgid "Fri"
msgstr "Fr"
-#: ../../include/js_strings.php:82
+#: ../../include/js_strings.php:88
msgid "Sat"
msgstr "Sa"
-#: ../../include/js_strings.php:83
+#: ../../include/js_strings.php:89
msgctxt "calendar"
msgid "today"
msgstr "heute"
-#: ../../include/js_strings.php:84
+#: ../../include/js_strings.php:90
msgctxt "calendar"
msgid "month"
msgstr "Monat"
-#: ../../include/js_strings.php:85
+#: ../../include/js_strings.php:91
msgctxt "calendar"
msgid "week"
msgstr "Woche"
-#: ../../include/js_strings.php:86
+#: ../../include/js_strings.php:92
msgctxt "calendar"
msgid "day"
msgstr "Tag"
-#: ../../include/js_strings.php:87
+#: ../../include/js_strings.php:93
msgctxt "calendar"
msgid "All day"
msgstr "Ganztägig"
@@ -12598,61 +12896,61 @@ msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
msgid "Item was not found."
msgstr "Beitrag wurde nicht gefunden."
-#: ../../include/attach.php:553
+#: ../../include/attach.php:554
msgid "No source file."
msgstr "Keine Quelldatei."
-#: ../../include/attach.php:575
+#: ../../include/attach.php:576
msgid "Cannot locate file to replace"
msgstr "Kann Datei zum Ersetzen nicht finden"
-#: ../../include/attach.php:593
+#: ../../include/attach.php:595
msgid "Cannot locate file to revise/update"
msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
-#: ../../include/attach.php:734
+#: ../../include/attach.php:737
#, php-format
msgid "File exceeds size limit of %d"
msgstr "Datei überschreitet das Größen-Limit von %d"
-#: ../../include/attach.php:754
+#: ../../include/attach.php:758
#, php-format
msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
-#: ../../include/attach.php:929
+#: ../../include/attach.php:940
msgid "File upload failed. Possible system limit or action terminated."
msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
-#: ../../include/attach.php:948
+#: ../../include/attach.php:959
msgid "Stored file could not be verified. Upload failed."
msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
-#: ../../include/attach.php:1022 ../../include/attach.php:1038
+#: ../../include/attach.php:1033 ../../include/attach.php:1049
msgid "Path not available."
msgstr "Pfad nicht verfügbar."
-#: ../../include/attach.php:1087 ../../include/attach.php:1252
+#: ../../include/attach.php:1098 ../../include/attach.php:1263
msgid "Empty pathname"
msgstr "Leere Pfadangabe"
-#: ../../include/attach.php:1113
+#: ../../include/attach.php:1124
msgid "duplicate filename or path"
msgstr "doppelter Dateiname oder Pfad"
-#: ../../include/attach.php:1138
+#: ../../include/attach.php:1149
msgid "Path not found."
msgstr "Pfad nicht gefunden."
-#: ../../include/attach.php:1206
+#: ../../include/attach.php:1217
msgid "mkdir failed."
msgstr "mkdir fehlgeschlagen."
-#: ../../include/attach.php:1210
+#: ../../include/attach.php:1221
msgid "database storage failed."
msgstr "Speichern in der Datenbank fehlgeschlagen."
-#: ../../include/attach.php:1258
+#: ../../include/attach.php:1269
msgid "Empty path"
msgstr "Leere Pfadangabe"
@@ -12699,34 +12997,34 @@ msgstr "Nur für akzeptierte Verbindungen sichtbar."
msgid "Visible to specific connections."
msgstr "Sichtbar für bestimmte Verbindungen."
-#: ../../include/items.php:4117
+#: ../../include/items.php:4147
msgid "Privacy group is empty."
msgstr "Gruppe ist leer."
-#: ../../include/items.php:4124
+#: ../../include/items.php:4154
#, php-format
msgid "Privacy group: %s"
msgstr "Gruppe: %s"
-#: ../../include/items.php:4136
+#: ../../include/items.php:4166
msgid "Connection not found."
msgstr "Die Verbindung wurde nicht gefunden."
-#: ../../include/items.php:4485
+#: ../../include/items.php:4515
msgid "profile photo"
msgstr "Profilfoto"
-#: ../../include/items.php:4676
+#: ../../include/items.php:4706
#, php-format
msgid "[Edited %s]"
msgstr "[%s wurde bearbeitet]"
-#: ../../include/items.php:4676
+#: ../../include/items.php:4706
msgctxt "edit_activity"
msgid "Post"
msgstr "Beitrag"
-#: ../../include/items.php:4676
+#: ../../include/items.php:4706
msgctxt "edit_activity"
msgid "Comment"
msgstr "Kommentar"
@@ -12745,7 +13043,7 @@ msgstr "Name ist zu lang"
#: ../../include/channel.php:188
msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+msgstr "Keine Konten-Kennung"
#: ../../include/channel.php:200
msgid "Nickname is required."
@@ -12771,11 +13069,11 @@ msgstr "Neues Profil erstellen"
msgid "Visible to everybody"
msgstr "Für jeden sichtbar"
-#: ../../include/channel.php:1396 ../../include/channel.php:1523
+#: ../../include/channel.php:1396 ../../include/channel.php:1524
msgid "Gender:"
msgstr "Geschlecht:"
-#: ../../include/channel.php:1398 ../../include/channel.php:1578
+#: ../../include/channel.php:1398 ../../include/channel.php:1579
msgid "Homepage:"
msgstr "Homepage:"
@@ -12783,108 +13081,112 @@ msgstr "Homepage:"
msgid "Online Now"
msgstr "gerade online"
-#: ../../include/channel.php:1482
+#: ../../include/channel.php:1452
+msgid "Change your profile photo"
+msgstr "Dein Profilfoto ändern"
+
+#: ../../include/channel.php:1483
msgid "Trans"
-msgstr ""
+msgstr "Trans"
-#: ../../include/channel.php:1528
+#: ../../include/channel.php:1529
msgid "Like this channel"
msgstr "Dieser Kanal gefällt mir"
-#: ../../include/channel.php:1552
+#: ../../include/channel.php:1553
msgid "j F, Y"
msgstr "j. F Y"
-#: ../../include/channel.php:1553
+#: ../../include/channel.php:1554
msgid "j F"
msgstr "j. F"
-#: ../../include/channel.php:1560
+#: ../../include/channel.php:1561
msgid "Birthday:"
msgstr "Geburtstag:"
-#: ../../include/channel.php:1573
+#: ../../include/channel.php:1574
#, php-format
msgid "for %1$d %2$s"
msgstr "seit %1$d %2$s"
-#: ../../include/channel.php:1576
+#: ../../include/channel.php:1577
msgid "Sexual Preference:"
msgstr "Sexuelle Orientierung:"
-#: ../../include/channel.php:1582
+#: ../../include/channel.php:1583
msgid "Tags:"
msgstr "Schlagworte:"
-#: ../../include/channel.php:1584
+#: ../../include/channel.php:1585
msgid "Political Views:"
msgstr "Politische Ansichten:"
-#: ../../include/channel.php:1586
+#: ../../include/channel.php:1587
msgid "Religion:"
msgstr "Religion:"
-#: ../../include/channel.php:1590
+#: ../../include/channel.php:1591
msgid "Hobbies/Interests:"
msgstr "Hobbys/Interessen:"
-#: ../../include/channel.php:1592
+#: ../../include/channel.php:1593
msgid "Likes:"
msgstr "Gefällt:"
-#: ../../include/channel.php:1594
+#: ../../include/channel.php:1595
msgid "Dislikes:"
msgstr "Gefällt nicht:"
-#: ../../include/channel.php:1596
+#: ../../include/channel.php:1597
msgid "Contact information and Social Networks:"
msgstr "Kontaktinformation und soziale Netzwerke:"
-#: ../../include/channel.php:1598
+#: ../../include/channel.php:1599
msgid "My other channels:"
msgstr "Meine anderen Kanäle:"
-#: ../../include/channel.php:1600
+#: ../../include/channel.php:1601
msgid "Musical interests:"
msgstr "Musikalische Interessen:"
-#: ../../include/channel.php:1602
+#: ../../include/channel.php:1603
msgid "Books, literature:"
msgstr "Bücher, Literatur:"
-#: ../../include/channel.php:1604
+#: ../../include/channel.php:1605
msgid "Television:"
msgstr "Fernsehen:"
-#: ../../include/channel.php:1606
+#: ../../include/channel.php:1607
msgid "Film/dance/culture/entertainment:"
msgstr "Film/Tanz/Kultur/Unterhaltung:"
-#: ../../include/channel.php:1608
+#: ../../include/channel.php:1609
msgid "Love/Romance:"
msgstr "Liebe/Romantik:"
-#: ../../include/channel.php:1610
+#: ../../include/channel.php:1611
msgid "Work/employment:"
msgstr "Arbeit/Anstellung:"
-#: ../../include/channel.php:1612
+#: ../../include/channel.php:1613
msgid "School/education:"
msgstr "Schule/Ausbildung:"
-#: ../../include/channel.php:1635
+#: ../../include/channel.php:1636
msgid "Like this thing"
msgstr "Gefällt mir"
-#: ../../include/event.php:23 ../../include/event.php:70
+#: ../../include/event.php:24 ../../include/event.php:71
msgid "l F d, Y \\@ g:i A"
msgstr "l, d. F Y, H:i"
-#: ../../include/event.php:31 ../../include/event.php:74
+#: ../../include/event.php:32 ../../include/event.php:75
msgid "Starts:"
msgstr "Beginnt:"
-#: ../../include/event.php:41 ../../include/event.php:78
+#: ../../include/event.php:42 ../../include/event.php:79
msgid "Finishes:"
msgstr "Endet:"
@@ -12892,167 +13194,175 @@ msgstr "Endet:"
msgid "This event has been added to your calendar."
msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
-#: ../../include/event.php:1220
+#: ../../include/event.php:1227
msgid "Not specified"
msgstr "Keine Angabe"
-#: ../../include/event.php:1221
+#: ../../include/event.php:1228
msgid "Needs Action"
msgstr "Aktion erforderlich"
-#: ../../include/event.php:1222
+#: ../../include/event.php:1229
msgid "Completed"
msgstr "Abgeschlossen"
-#: ../../include/event.php:1223
+#: ../../include/event.php:1230
msgid "In Process"
msgstr "In Bearbeitung"
-#: ../../include/event.php:1224
+#: ../../include/event.php:1231
msgid "Cancelled"
msgstr "gestrichen"
-#: ../../include/event.php:1303 ../../include/connections.php:684
+#: ../../include/event.php:1310 ../../include/connections.php:684
msgid "Home, Voice"
msgstr "Zuhause, Sprache"
-#: ../../include/event.php:1304 ../../include/connections.php:685
+#: ../../include/event.php:1311 ../../include/connections.php:685
msgid "Home, Fax"
msgstr "Zuhause, Fax"
-#: ../../include/event.php:1306 ../../include/connections.php:687
+#: ../../include/event.php:1313 ../../include/connections.php:687
msgid "Work, Voice"
msgstr "Arbeit, Sprache"
-#: ../../include/event.php:1307 ../../include/connections.php:688
+#: ../../include/event.php:1314 ../../include/connections.php:688
msgid "Work, Fax"
msgstr "Arbeit, Fax"
-#: ../../include/network.php:761
+#: ../../include/network.php:762
msgid "view full size"
msgstr "In Vollbildansicht anschauen"
-#: ../../include/network.php:1763 ../../include/network.php:1764
+#: ../../include/network.php:1769 ../../include/network.php:1770
msgid "Friendica"
msgstr "Friendica"
-#: ../../include/network.php:1765
+#: ../../include/network.php:1771
msgid "OStatus"
msgstr "OStatus"
-#: ../../include/network.php:1766
+#: ../../include/network.php:1772
msgid "GNU-Social"
msgstr "GNU-Social"
-#: ../../include/network.php:1767
+#: ../../include/network.php:1773
msgid "RSS/Atom"
msgstr "RSS/Atom"
-#: ../../include/network.php:1770
+#: ../../include/network.php:1776
msgid "Diaspora"
msgstr "Diaspora"
-#: ../../include/network.php:1771
+#: ../../include/network.php:1777
msgid "Facebook"
msgstr "Facebook"
-#: ../../include/network.php:1772
+#: ../../include/network.php:1778
msgid "Zot"
-msgstr "Zot!"
+msgstr "Zot"
-#: ../../include/network.php:1773
+#: ../../include/network.php:1779
msgid "LinkedIn"
msgstr "LinkedIn"
-#: ../../include/network.php:1774
+#: ../../include/network.php:1780
msgid "XMPP/IM"
msgstr "XMPP/IM"
-#: ../../include/network.php:1775
+#: ../../include/network.php:1781
msgid "MySpace"
msgstr "MySpace"
-#: ../../include/language.php:377
+#: ../../include/language.php:410
msgid "Select an alternate language"
msgstr "Wähle eine alternative Sprache"
-#: ../../include/acl_selectors.php:208
+#: ../../include/acl_selectors.php:113
msgid "Who can see this?"
msgstr "Wer kann das sehen?"
-#: ../../include/acl_selectors.php:209
+#: ../../include/acl_selectors.php:114
msgid "Custom selection"
msgstr "Benutzerdefinierte Auswahl"
-#: ../../include/acl_selectors.php:210
+#: ../../include/acl_selectors.php:115
msgid ""
"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
" the scope of \"Show\"."
msgstr "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen."
-#: ../../include/acl_selectors.php:211
+#: ../../include/acl_selectors.php:116
msgid "Show"
msgstr "Anzeigen"
-#: ../../include/acl_selectors.php:212
+#: ../../include/acl_selectors.php:117
msgid "Don't show"
msgstr "Nicht anzeigen"
-#: ../../include/acl_selectors.php:245
+#: ../../include/acl_selectors.php:150
#, php-format
msgid ""
"Post permissions %s cannot be changed %s after a post is shared.</br />These"
" permissions set who is allowed to view the post."
msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
-#: ../../include/dba/dba_driver.php:190
+#: ../../include/dba/dba_driver.php:178
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
-#: ../../include/bbcode.php:194 ../../include/bbcode.php:1106
-#: ../../include/bbcode.php:1109 ../../include/bbcode.php:1114
-#: ../../include/bbcode.php:1117 ../../include/bbcode.php:1120
-#: ../../include/bbcode.php:1123 ../../include/bbcode.php:1128
-#: ../../include/bbcode.php:1131 ../../include/bbcode.php:1136
-#: ../../include/bbcode.php:1139 ../../include/bbcode.php:1142
-#: ../../include/bbcode.php:1145
+#: ../../include/bbcode.php:198 ../../include/bbcode.php:1151
+#: ../../include/bbcode.php:1154 ../../include/bbcode.php:1159
+#: ../../include/bbcode.php:1162 ../../include/bbcode.php:1165
+#: ../../include/bbcode.php:1168 ../../include/bbcode.php:1173
+#: ../../include/bbcode.php:1176 ../../include/bbcode.php:1181
+#: ../../include/bbcode.php:1184 ../../include/bbcode.php:1187
+#: ../../include/bbcode.php:1190
msgid "Image/photo"
msgstr "Bild/Foto"
-#: ../../include/bbcode.php:233 ../../include/bbcode.php:1156
+#: ../../include/bbcode.php:237 ../../include/bbcode.php:1201
msgid "Encrypted content"
msgstr "Verschlüsselter Inhalt"
-#: ../../include/bbcode.php:249
+#: ../../include/bbcode.php:253
#, php-format
msgid "Install %1$s element %2$s"
-msgstr ""
+msgstr "Installiere %1$s Element %2$s"
-#: ../../include/bbcode.php:253
+#: ../../include/bbcode.php:257
#, php-format
msgid ""
"This post contains an installable %s element, however you lack permissions "
"to install it on this site."
msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
-#: ../../include/bbcode.php:331
+#: ../../include/bbcode.php:335
msgid "card"
msgstr "Karte"
-#: ../../include/bbcode.php:333
+#: ../../include/bbcode.php:337
msgid "article"
msgstr "Artikel"
-#: ../../include/bbcode.php:416 ../../include/bbcode.php:424
+#: ../../include/bbcode.php:420 ../../include/bbcode.php:428
msgid "Click to open/close"
msgstr "Klicke zum Öffnen/Schließen"
-#: ../../include/bbcode.php:424
+#: ../../include/bbcode.php:428
msgid "spoiler"
msgstr "Spoiler"
-#: ../../include/bbcode.php:1094
+#: ../../include/bbcode.php:441
+msgid "View article"
+msgstr "Artikel ansehen"
+
+#: ../../include/bbcode.php:441
+msgid "View summary"
+msgstr "Zusammenfassung ansehen"
+
+#: ../../include/bbcode.php:1139
msgid "$1 wrote:"
msgstr "$1 schrieb:"
@@ -13072,7 +13382,7 @@ msgstr "Eingebetteter Inhalt"
msgid "Embedding disabled"
msgstr "Einbetten deaktiviert"
-#: ../../include/zid.php:340
+#: ../../include/zid.php:346
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr "OpenWebAuth: %1$s heißt %2$s willkommen"
@@ -13081,344 +13391,364 @@ msgstr "OpenWebAuth: %1$s heißt %2$s willkommen"
msgid "General Features"
msgstr "Allgemeine Funktionen"
-#: ../../include/features.php:59
-msgid "Multiple Profiles"
-msgstr "Mehrfachprofile"
-
#: ../../include/features.php:60
-msgid "Ability to create multiple profiles"
-msgstr "Ermöglicht das Anlegen mehrerer Profile pro Kanal"
-
-#: ../../include/features.php:68
msgid "Advanced Profiles"
msgstr "Erweiterte Profile"
-#: ../../include/features.php:69
+#: ../../include/features.php:61
msgid "Additional profile sections and selections"
msgstr "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung"
-#: ../../include/features.php:77
+#: ../../include/features.php:69
msgid "Profile Import/Export"
msgstr "Profil-Import/Export"
-#: ../../include/features.php:78
+#: ../../include/features.php:70
msgid "Save and load profile details across sites/channels"
msgstr "Ermöglicht das Speichern von Profilen, um sie in einen anderen Kanal zu importieren"
-#: ../../include/features.php:86
+#: ../../include/features.php:78
msgid "Web Pages"
msgstr "Webseiten"
-#: ../../include/features.php:87
+#: ../../include/features.php:79
msgid "Provide managed web pages on your channel"
msgstr "Ermöglicht das Erstellen von Webseiten in Deinem Kanal"
-#: ../../include/features.php:96
+#: ../../include/features.php:88
msgid "Provide a wiki for your channel"
msgstr "Stelle ein Wiki in Deinem Kanal zur Verfügung"
-#: ../../include/features.php:113
+#: ../../include/features.php:105
msgid "Private Notes"
msgstr "Private Notizen"
-#: ../../include/features.php:114
+#: ../../include/features.php:106
msgid "Enables a tool to store notes and reminders (note: not encrypted)"
msgstr "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)"
-#: ../../include/features.php:123
+#: ../../include/features.php:115
msgid "Create personal planning cards"
msgstr "Erstelle persönliche (Notiz-)Karten zur Planung/Koordination oder ähnlichen Zwecken"
-#: ../../include/features.php:141
+#: ../../include/features.php:125
+msgid "Create interactive articles"
+msgstr "Erstelle interaktive Artikel"
+
+#: ../../include/features.php:133
msgid "Navigation Channel Select"
msgstr "Kanal-Auswahl in der Navigationsleiste"
-#: ../../include/features.php:142
+#: ../../include/features.php:134
msgid "Change channels directly from within the navigation dropdown menu"
msgstr "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü"
-#: ../../include/features.php:150
+#: ../../include/features.php:142
msgid "Photo Location"
msgstr "Aufnahmeort"
-#: ../../include/features.php:151
+#: ../../include/features.php:143
msgid "If location data is available on uploaded photos, link this to a map."
msgstr "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte"
-#: ../../include/features.php:159
+#: ../../include/features.php:151
msgid "Access Controlled Chatrooms"
msgstr "Zugriffskontrollierte Chaträume"
-#: ../../include/features.php:160
+#: ../../include/features.php:152
msgid "Provide chatrooms and chat services with access control."
msgstr "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an."
-#: ../../include/features.php:169
-msgid "Provide alternate connection permission roles."
-msgstr "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung."
-
-#: ../../include/features.php:177
+#: ../../include/features.php:161
msgid "Smart Birthdays"
msgstr "Smarte Geburtstage"
-#: ../../include/features.php:178
+#: ../../include/features.php:162
msgid ""
"Make birthday events timezone aware in case your friends are scattered "
"across the planet."
msgstr "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind."
-#: ../../include/features.php:186
+#: ../../include/features.php:170
msgid "Event Timezone Selection"
msgstr "Termin-Zeitzonenauswahl"
-#: ../../include/features.php:187
+#: ../../include/features.php:171
msgid "Allow event creation in timezones other than your own."
msgstr "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen."
-#: ../../include/features.php:195
+#: ../../include/features.php:180
+msgid "Premium Channel"
+msgstr "Premium-Kanal"
+
+#: ../../include/features.php:181
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
+
+#: ../../include/features.php:189
msgid "Advanced Directory Search"
msgstr "Erweiterte Verzeichnissuche"
-#: ../../include/features.php:196
+#: ../../include/features.php:190
msgid "Allows creation of complex directory search queries"
msgstr "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen"
-#: ../../include/features.php:204
+#: ../../include/features.php:198
msgid "Advanced Theme and Layout Settings"
msgstr "Erweiterte Design- und Layout-Einstellungen"
-#: ../../include/features.php:205
+#: ../../include/features.php:199
msgid "Allows fine tuning of themes and page layouts"
msgstr "Erlaubt die Feineinstellung von Designs und Seitenlayouts"
-#: ../../include/features.php:215
+#: ../../include/features.php:208
+msgid "Access Control and Permissions"
+msgstr "Zugriffskontrolle und Berechtigungen"
+
+#: ../../include/features.php:212 ../../include/group.php:328
+msgid "Privacy Groups"
+msgstr "Gruppen"
+
+#: ../../include/features.php:213
+msgid "Enable management and selection of privacy groups"
+msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
+
+#: ../../include/features.php:221
+msgid "Multiple Profiles"
+msgstr "Mehrfachprofile"
+
+#: ../../include/features.php:222
+msgid "Ability to create multiple profiles"
+msgstr "Ermöglicht das Anlegen mehrerer Profile pro Kanal"
+
+#: ../../include/features.php:232
+msgid "Provide alternate connection permission roles."
+msgstr "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung."
+
+#: ../../include/features.php:240
+msgid "OAuth Clients"
+msgstr "OAuth Clients"
+
+#: ../../include/features.php:241
+msgid "Manage authenticatication tokens for mobile and remote apps."
+msgstr "Verwalte Tokens für den Zugriff von mobilen bzw. externen Anwendungen."
+
+#: ../../include/features.php:249
+msgid "Access Tokens"
+msgstr "Zugangstokens"
+
+#: ../../include/features.php:250
+msgid "Create access tokens so that non-members can access private content."
+msgstr "Erzeuge Tokens für den Zugriff von Nicht-Mitgliedern auf private Inhalte."
+
+#: ../../include/features.php:261
msgid "Post Composition Features"
msgstr "Nachbearbeitungsfunktionen"
-#: ../../include/features.php:219
+#: ../../include/features.php:265
msgid "Large Photos"
msgstr "Große Fotos"
-#: ../../include/features.php:220
+#: ../../include/features.php:266
msgid ""
"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
"(640px) photo thumbnails"
msgstr "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet."
-#: ../../include/features.php:229
+#: ../../include/features.php:275
msgid "Automatically import channel content from other channels or feeds"
msgstr "Ermöglicht den automatischen Import von Inhalten für diesen Kanal von anderen Kanälen oder Feeds"
-#: ../../include/features.php:237
+#: ../../include/features.php:283
msgid "Even More Encryption"
msgstr "Noch mehr Verschlüsselung"
-#: ../../include/features.php:238
+#: ../../include/features.php:284
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr "Ermöglicht optional die zusätzliche Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Schlüssel)"
-#: ../../include/features.php:246
+#: ../../include/features.php:292
msgid "Enable Voting Tools"
msgstr "Umfragewerkzeuge aktivieren"
-#: ../../include/features.php:247
+#: ../../include/features.php:293
msgid "Provide a class of post which others can vote on"
msgstr "Aktiviert die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, einem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)"
-#: ../../include/features.php:255
+#: ../../include/features.php:301
msgid "Disable Comments"
msgstr "Kommentare deaktivieren"
-#: ../../include/features.php:256
+#: ../../include/features.php:302
msgid "Provide the option to disable comments for a post"
msgstr "Ermöglicht, die Kommentarfunktion für einzelne Beiträge abzuschalten"
-#: ../../include/features.php:264
+#: ../../include/features.php:310
msgid "Delayed Posting"
msgstr "Verzögertes Senden"
-#: ../../include/features.php:265
+#: ../../include/features.php:311
msgid "Allow posts to be published at a later date"
msgstr "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen"
-#: ../../include/features.php:273
+#: ../../include/features.php:319
msgid "Content Expiration"
msgstr "Verfall von Inhalten"
-#: ../../include/features.php:274
+#: ../../include/features.php:320
msgid "Remove posts/comments and/or private messages at a future time"
msgstr "Ermöglicht das automatische Löschen von Beiträgen, Kommentaren und/oder privaten Nachrichten zu einem zukünftigen Datum."
-#: ../../include/features.php:282
+#: ../../include/features.php:328
msgid "Suppress Duplicate Posts/Comments"
msgstr "Doppelte Beiträge unterdrücken"
-#: ../../include/features.php:283
+#: ../../include/features.php:329
msgid ""
"Prevent posts with identical content to be published with less than two "
"minutes in between submissions."
msgstr "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden."
-#: ../../include/features.php:294
+#: ../../include/features.php:340
msgid "Network and Stream Filtering"
msgstr "Netzwerk- und Stream-Filter"
-#: ../../include/features.php:298
+#: ../../include/features.php:344
msgid "Search by Date"
msgstr "Suche nach Datum"
-#: ../../include/features.php:299
+#: ../../include/features.php:345
msgid "Ability to select posts by date ranges"
msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
-#: ../../include/features.php:307 ../../include/group.php:328
-msgid "Privacy Groups"
-msgstr "Gruppen"
-
-#: ../../include/features.php:308
-msgid "Enable management and selection of privacy groups"
-msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
-
-#: ../../include/features.php:317
+#: ../../include/features.php:355
msgid "Save search terms for re-use"
msgstr "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung"
-#: ../../include/features.php:325
+#: ../../include/features.php:363
msgid "Network Personal Tab"
msgstr "Persönlicher Netzwerkreiter"
-#: ../../include/features.php:326
+#: ../../include/features.php:364
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast"
-#: ../../include/features.php:334
+#: ../../include/features.php:372
msgid "Network New Tab"
msgstr "Netzwerkreiter Neu"
-#: ../../include/features.php:335
+#: ../../include/features.php:373
msgid "Enable tab to display all new Network activity"
msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der alle neuen Netzwerkaktivitäten anzeigt"
-#: ../../include/features.php:343
+#: ../../include/features.php:381
msgid "Affinity Tool"
msgstr "Beziehungs-Tool"
-#: ../../include/features.php:344
+#: ../../include/features.php:382
msgid "Filter stream activity by depth of relationships"
msgstr "Aktiviert ein Werkzeug in der Grid-Ansicht, das den Stream nach Grad der Beziehung filtern kann"
-#: ../../include/features.php:353
+#: ../../include/features.php:391
msgid "Show friend and connection suggestions"
msgstr "Freund- und Verbindungsvorschläge anzeigen"
-#: ../../include/features.php:361
+#: ../../include/features.php:399
msgid "Connection Filtering"
msgstr "Filter für Verbindungen"
-#: ../../include/features.php:362
+#: ../../include/features.php:400
msgid "Filter incoming posts from connections based on keywords/content"
msgstr "Ermöglicht die Filterung eingehender Beiträge anhand von Schlüsselwörtern (muss an der Verbindung konfiguriert werden)"
-#: ../../include/features.php:374
+#: ../../include/features.php:412
msgid "Post/Comment Tools"
msgstr "Beitrag-/Kommentar-Tools"
-#: ../../include/features.php:379
-msgid "Use markdown for editing posts"
-msgstr "Verwende Markdown zum Bearbeiten von Beiträgen"
-
-#: ../../include/features.php:387
+#: ../../include/features.php:416
msgid "Community Tagging"
msgstr "Gemeinschaftliches Verschlagworten"
-#: ../../include/features.php:388
+#: ../../include/features.php:417
msgid "Ability to tag existing posts"
msgstr "Ermöglicht das Verschlagworten existierender Beiträge"
-#: ../../include/features.php:396
+#: ../../include/features.php:425
msgid "Post Categories"
msgstr "Beitrags-Kategorien"
-#: ../../include/features.php:397
+#: ../../include/features.php:426
msgid "Add categories to your posts"
msgstr "Aktiviert Kategorien für Beiträge"
-#: ../../include/features.php:405
+#: ../../include/features.php:434
msgid "Emoji Reactions"
msgstr "Emoji Reaktionen"
-#: ../../include/features.php:406
+#: ../../include/features.php:435
msgid "Add emoji reaction ability to posts"
msgstr "Aktiviert Emoji-Reaktionen für Beiträge"
-#: ../../include/features.php:415
+#: ../../include/features.php:444
msgid "Ability to file posts under folders"
msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
-#: ../../include/features.php:423
+#: ../../include/features.php:452
msgid "Dislike Posts"
msgstr "Gefällt-mir-nicht-Beiträge"
-#: ../../include/features.php:424
+#: ../../include/features.php:453
msgid "Ability to dislike posts/comments"
msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche"
-#: ../../include/features.php:432
+#: ../../include/features.php:461
msgid "Star Posts"
msgstr "Beiträge mit Sternchen versehen"
-#: ../../include/features.php:433
+#: ../../include/features.php:462
msgid "Ability to mark special posts with a star indicator"
msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"
-#: ../../include/features.php:441
+#: ../../include/features.php:470
msgid "Tag Cloud"
msgstr "Schlagwort-Wolke"
-#: ../../include/features.php:442
+#: ../../include/features.php:471
msgid "Provide a personal tag cloud on your channel page"
msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"
-#: ../../include/features.php:453
-msgid "Premium Channel"
-msgstr "Premium-Kanal"
-
-#: ../../include/features.php:454
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
-
-#: ../../include/taxonomy.php:377 ../../include/taxonomy.php:398
+#: ../../include/taxonomy.php:384 ../../include/taxonomy.php:405
msgid "Tags"
msgstr "Schlagwörter"
-#: ../../include/taxonomy.php:483
+#: ../../include/taxonomy.php:487
msgid "Keywords"
msgstr "Schlüsselwörter"
-#: ../../include/taxonomy.php:504
+#: ../../include/taxonomy.php:508
msgid "have"
msgstr "habe"
-#: ../../include/taxonomy.php:504
+#: ../../include/taxonomy.php:508
msgid "has"
msgstr "hat"
-#: ../../include/taxonomy.php:505
+#: ../../include/taxonomy.php:509
msgid "want"
msgstr "will"
-#: ../../include/taxonomy.php:505
+#: ../../include/taxonomy.php:509
msgid "wants"
msgstr "will"
-#: ../../include/taxonomy.php:506
+#: ../../include/taxonomy.php:510
msgid "likes"
msgstr "gefällt"
-#: ../../include/taxonomy.php:507
+#: ../../include/taxonomy.php:511
msgid "dislikes"
msgstr "missfällt"
@@ -13450,256 +13780,200 @@ msgstr "Bitte gib die benötigten Informationen ein."
msgid "Failed to store account information."
msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
-#: ../../include/account.php:291
+#: ../../include/account.php:313
#, php-format
msgid "Registration confirmation for %s"
msgstr "Registrierungsbestätigung für %s"
-#: ../../include/account.php:360
+#: ../../include/account.php:382
#, php-format
msgid "Registration request at %s"
msgstr "Registrierungsanfrage auf %s"
-#: ../../include/account.php:382
+#: ../../include/account.php:404
msgid "your registration password"
msgstr "Dein Registrierungspasswort"
-#: ../../include/account.php:388 ../../include/account.php:450
+#: ../../include/account.php:410 ../../include/account.php:472
#, php-format
msgid "Registration details for %s"
msgstr "Registrierungsdetails für %s"
-#: ../../include/account.php:461
+#: ../../include/account.php:483
msgid "Account approved."
msgstr "Nutzerkonto bestätigt."
-#: ../../include/account.php:501
+#: ../../include/account.php:523
#, php-format
msgid "Registration revoked for %s"
msgstr "Registrierung für %s wurde widerrufen"
-#: ../../include/account.php:780 ../../include/account.php:782
+#: ../../include/account.php:802 ../../include/account.php:804
msgid "Click here to upgrade."
msgstr "Klicke hier, um das Upgrade durchzuführen."
-#: ../../include/account.php:788
+#: ../../include/account.php:810
msgid "This action exceeds the limits set by your subscription plan."
msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
-#: ../../include/account.php:793
+#: ../../include/account.php:815
msgid "This action is not available under your subscription plan."
msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
-#: ../../include/datetime.php:150
+#: ../../include/datetime.php:134
msgid "Birthday"
msgstr "Geburtstag"
-#: ../../include/datetime.php:152
+#: ../../include/datetime.php:134
msgid "Age: "
msgstr "Alter:"
-#: ../../include/datetime.php:154
+#: ../../include/datetime.php:134
msgid "YYYY-MM-DD or MM-DD"
msgstr "JJJJ-MM-TT oder MM-TT"
-#: ../../include/datetime.php:298
+#: ../../include/datetime.php:238
msgid "less than a second ago"
msgstr "Vor weniger als einer Sekunde"
-#: ../../include/datetime.php:316
+#: ../../include/datetime.php:256
#, php-format
msgctxt "e.g. 22 hours ago, 1 minute ago"
msgid "%1$d %2$s ago"
msgstr "vor %1$d %2$s"
-#: ../../include/datetime.php:327
+#: ../../include/datetime.php:267
msgctxt "relative_date"
msgid "year"
msgid_plural "years"
msgstr[0] "Jahr"
msgstr[1] "Jahre"
-#: ../../include/datetime.php:330
+#: ../../include/datetime.php:270
msgctxt "relative_date"
msgid "month"
msgid_plural "months"
msgstr[0] "Monat"
msgstr[1] "Monate"
-#: ../../include/datetime.php:333
+#: ../../include/datetime.php:273
msgctxt "relative_date"
msgid "week"
msgid_plural "weeks"
msgstr[0] "Woche"
msgstr[1] "Wochen"
-#: ../../include/datetime.php:336
+#: ../../include/datetime.php:276
msgctxt "relative_date"
msgid "day"
msgid_plural "days"
msgstr[0] "Tag"
msgstr[1] "Tage"
-#: ../../include/datetime.php:339
+#: ../../include/datetime.php:279
msgctxt "relative_date"
msgid "hour"
msgid_plural "hours"
msgstr[0] "Stunde"
msgstr[1] "Stunden"
-#: ../../include/datetime.php:342
+#: ../../include/datetime.php:282
msgctxt "relative_date"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "Minute"
msgstr[1] "Minuten"
-#: ../../include/datetime.php:345
+#: ../../include/datetime.php:285
msgctxt "relative_date"
msgid "second"
msgid_plural "seconds"
msgstr[0] "Sekunde"
msgstr[1] "Sekunden"
-#: ../../include/datetime.php:579
+#: ../../include/datetime.php:514
#, php-format
msgid "%1$s's birthday"
msgstr "%1$ss Geburtstag"
-#: ../../include/datetime.php:580
+#: ../../include/datetime.php:515
#, php-format
msgid "Happy Birthday %1$s"
msgstr "Alles Gute zum Geburtstag, %1$s"
-#: ../../include/nav.php:98
+#: ../../include/nav.php:96
msgid "Remote authentication"
msgstr "Über Konto auf anderem Server einloggen"
-#: ../../include/nav.php:98
+#: ../../include/nav.php:96
msgid "Click to authenticate to your home hub"
msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
-#: ../../include/nav.php:105
-msgid "Network Activity"
-msgstr "Netzwerk-Aktivitäten"
-
-#: ../../include/nav.php:107
-msgid "Mark all activity notifications seen"
-msgstr "Alle Benachrichtigungen als gesehen markieren"
-
-#: ../../include/nav.php:109
-msgid "Channel home"
-msgstr "Mein Kanal"
-
-#: ../../include/nav.php:110
-msgid "View your channel home"
-msgstr "Zeige Deine Kanalseite an"
-
-#: ../../include/nav.php:111
-msgid "Mark all channel notifications seen"
-msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
-
-#: ../../include/nav.php:116
-msgid "Registrations"
-msgstr "Registrierungen"
-
-#: ../../include/nav.php:119
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#: ../../include/nav.php:120
-msgid "View all notifications"
-msgstr "Alle Benachrichtigungen ansehen"
-
-#: ../../include/nav.php:121
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle System-Benachrichtigungen als gesehen"
-
-#: ../../include/nav.php:123
-msgid "Private mail"
-msgstr "Persönliche Mail"
-
-#: ../../include/nav.php:124
-msgid "View your private messages"
-msgstr "Zeige Deine persönlichen Nachrichten an"
-
-#: ../../include/nav.php:125
-msgid "Mark all private messages seen"
-msgstr "Markiere alle persönlichen Nachrichten als gesehen"
-
-#: ../../include/nav.php:131
-msgid "Event Calendar"
-msgstr "Terminkalender"
-
-#: ../../include/nav.php:136 ../../include/nav.php:222
+#: ../../include/nav.php:102 ../../include/nav.php:190
msgid "Manage Your Channels"
msgstr "Verwalte Deine Kanäle"
-#: ../../include/nav.php:139 ../../include/nav.php:224
+#: ../../include/nav.php:105 ../../include/nav.php:192
msgid "Account/Channel Settings"
msgstr "Konto-/Kanal-Einstellungen"
-#: ../../include/nav.php:145 ../../include/nav.php:174
+#: ../../include/nav.php:111 ../../include/nav.php:140
msgid "End this session"
msgstr "Beende diese Sitzung"
-#: ../../include/nav.php:148
+#: ../../include/nav.php:114
msgid "Your profile page"
msgstr "Deine Profilseite"
-#: ../../include/nav.php:151
+#: ../../include/nav.php:117
msgid "Manage/Edit profiles"
msgstr "Profile verwalten"
-#: ../../include/nav.php:153
-msgid "Edit your profile"
-msgstr "Profil bearbeiten"
-
-#: ../../include/nav.php:160 ../../include/nav.php:164
+#: ../../include/nav.php:126 ../../include/nav.php:130
msgid "Sign in"
msgstr "Anmelden"
-#: ../../include/nav.php:189
+#: ../../include/nav.php:157
msgid "Take me home"
msgstr "Bringe mich nach Hause (eigener Kanal)"
-#: ../../include/nav.php:191
+#: ../../include/nav.php:159
msgid "Log me out of this site"
msgstr "Logge mich von dieser Seite aus"
-#: ../../include/nav.php:196
+#: ../../include/nav.php:164
msgid "Create an account"
msgstr "Erzeuge ein Konto"
-#: ../../include/nav.php:208
+#: ../../include/nav.php:176
msgid "Help and documentation"
msgstr "Hilfe und Dokumentation"
-#: ../../include/nav.php:211
+#: ../../include/nav.php:179
msgid "Search site @name, #tag, ?docs, content"
msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
-#: ../../include/nav.php:231
+#: ../../include/nav.php:199
msgid "Site Setup and Configuration"
msgstr "Seiten-Einrichtung und -Konfiguration"
-#: ../../include/nav.php:322
+#: ../../include/nav.php:290
msgid "@name, #tag, ?doc, content"
msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
-#: ../../include/nav.php:323
+#: ../../include/nav.php:291
msgid "Please wait..."
msgstr "Bitte warten..."
-#: ../../include/nav.php:329
+#: ../../include/nav.php:297
msgid "Add Apps"
msgstr "Apps hinzufügen"
-#: ../../include/nav.php:330
+#: ../../include/nav.php:298
msgid "Arrange Apps"
msgstr "Apps anordnen"
-#: ../../include/nav.php:331
+#: ../../include/nav.php:299
msgid "Toggle System Apps"
msgstr "System-Apps umschalten"
@@ -13730,19 +14004,23 @@ msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
msgid "Upload New Photos"
msgstr "Neue Fotos hochladen"
-#: ../../include/zot.php:675
+#: ../../include/zot.php:767
msgid "Invalid data packet"
msgstr "Ungültiges Datenpaket"
-#: ../../include/zot.php:702
+#: ../../include/zot.php:794
msgid "Unable to verify channel signature"
msgstr "Konnte die Signatur des Kanals nicht verifizieren"
-#: ../../include/zot.php:2409
+#: ../../include/zot.php:2529
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+#: ../../include/zot.php:4180
+msgid "invalid target signature"
+msgstr "Ungültige Signatur des Ziels"
+
#: ../../include/group.php:22
msgid ""
"A deleted group with this name was revived. Existing item permissions "
@@ -13786,7 +14064,7 @@ msgstr "Ausgeloggt."
msgid "Email validation is incomplete. Please check your email."
msgstr "E-Mail-Bestätigung nicht abgeschlossen. Bitte prüfe Deine E-Mails (ggf. Spam-Filterung mit berücksichtigen)."
-#: ../../include/auth.php:278
+#: ../../include/auth.php:279
msgid "Failed authentication"
msgstr "Authentifizierung fehlgeschlagen"
diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php
index e87f660f0..a96dd02b7 100644
--- a/view/de-de/hstrings.php
+++ b/view/de-de/hstrings.php
@@ -71,9 +71,8 @@ App::$strings["2. Enter my \$Projectname network address into the site searchbar
App::$strings["or visit"] = "oder besuche";
App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
App::$strings["Submit"] = "Absenden";
-App::$strings["Cards"] = "Karten";
-App::$strings["Add Article"] = "Artikel hinzufügen";
App::$strings["Articles"] = "Artikel";
+App::$strings["Add Article"] = "Artikel hinzufügen";
App::$strings["Item not found"] = "Element nicht gefunden";
App::$strings["Layout Name"] = "Layout-Name";
App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
@@ -151,7 +150,8 @@ App::$strings["You may also export your posts and conversations for a particular
App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
-App::$strings["Welcome to hubzilla!"] = "Willkommen bei Hubzilla!";
+App::$strings["Welcome to Hubzilla!"] = "Willkommen bei Hubzilla!";
+App::$strings["You have got no unseen posts..."] = "Du hast keine ungelesenen Beiträge...";
App::$strings["Public access denied."] = "Öffentlichen Zugriff verweigert.";
App::$strings["Search"] = "Suche";
App::$strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
@@ -282,6 +282,7 @@ App::$strings["Read more about roles"] = "Mehr Informationen über Rollen";
App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
+App::$strings["Validate"] = "Überprüfe";
App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
App::$strings["Remove This Channel"] = "Diesen Kanal löschen";
App::$strings["WARNING: "] = "WARNUNG: ";
@@ -319,7 +320,7 @@ App::$strings["Database Login Password"] = "Datenbank-Passwort";
App::$strings["Database Name"] = "Datenbankname";
App::$strings["Database Type"] = "Datenbanktyp";
App::$strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Kontos muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
App::$strings["Website URL"] = "Webseiten-URL";
App::$strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
App::$strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
@@ -412,10 +413,10 @@ App::$strings["Executing %s failed. Check system logs."] = "Ausführen von %s fe
App::$strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
App::$strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
-App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
App::$strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
App::$strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
App::$strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
+App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
App::$strings["Item not found."] = "Element nicht gefunden.";
App::$strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
App::$strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
@@ -542,6 +543,7 @@ App::$strings["Used to provide a member experience matched to technical comfort
App::$strings["Lock the technical skill level setting"] = "Sperre die technische Qualifikationsstufe";
App::$strings["Members can set their own technical comfort level by default"] = "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen";
App::$strings["Banner/Logo"] = "Banner/Logo";
+App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Ungefiltertes HTML/CSS/JS ist erlaubt";
App::$strings["Administrator Information"] = "Administrator-Informationen";
App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden.";
App::$strings["Site Information"] = "Seiteninformationen";
@@ -558,6 +560,8 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea
App::$strings["Does this site allow new member registration?"] = "Erlaubt dieser Server die Registrierung neuer Nutzer?";
App::$strings["Invitation only"] = "Nur mit Einladung";
App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden.";
+App::$strings["Minimum age"] = "Mindestalter";
+App::$strings["Minimum age (in years) for who may register on this site."] = "Mindestalter (in Jahren) für alle, die sich auf dieser Website anmelden möchten.";
App::$strings["Which best describes the types of account offered by this hub?"] = "Was ist die passendste Beschreibung der Konten auf diesem Hub?";
App::$strings["Register text"] = "Registrierungstext";
App::$strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
@@ -575,6 +579,10 @@ App::$strings["Force publish"] = "Veröffentlichung erzwingen";
App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
App::$strings["Import Public Streams"] = "Öffentliche Beiträge importieren";
App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert.";
+App::$strings["Site only Public Streams"] = "Öffentlichen Beitragsstrom auf diesen Server beschränken";
+App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Erlaubt den Zugriff auf öffentliche Beiträge von ausschließlich dieser Website (diesem Server), wenn \"Öffentliche Beiträge importieren\" ausgeschaltet ist.";
+App::$strings["Allow anybody on the internet to access the Public streams"] = "Allen im Internet Zugriff auf den öffentlichen Beitragsstrom erlauben";
+App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Deaktiviert die erforderliche Authentifizierung vor dem Ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
App::$strings["Login on Homepage"] = "Log-in auf der Startseite";
App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden.";
App::$strings["Enable context help"] = "Kontext-Hilfe aktivieren";
@@ -604,6 +612,12 @@ App::$strings["Maximum Load Average"] = "Maximales Load Average";
App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
App::$strings["Expiration period in days for imported (grid/network) content"] = "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen";
App::$strings["0 for no expiration of imported content"] = "0 = keine Löschung importierter Inhalte";
+App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung";
+App::$strings["Create this page first. Default is %s/register"] = "Erstelle zunächst die entsprechende Seite. Standard ist %s/register";
+App::$strings["Page to display after creating a new channel"] = "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll";
+App::$strings["Recommend: profiles, go, or settings"] = "Empfohlen: profiles, go oder settings";
+App::$strings["Optional: site location"] = "Optional: Standort der Website";
+App::$strings["Region or country"] = "Region oder Land";
App::$strings["New Profile Field"] = "Neues Profilfeld";
App::$strings["Field nickname"] = "Kurzname für das Feld";
App::$strings["System name of field"] = "Systemname des Feldes";
@@ -754,8 +768,8 @@ App::$strings["If your channel is mirrored to multiple hubs, set this to your pr
App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen";
App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus";
App::$strings["Must be greater than 0"] = "Muss größer als 0 sein";
-App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
-App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Konten- und Seitenart-Einstellungen";
+App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Kontos unter speziellen Umständen";
App::$strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
App::$strings["Default photo upload folder"] = "Voreingestellter Ordner für hochgeladene Fotos";
App::$strings["%Y - current year, %m - current month"] = "%Y - aktuelles Jahr, %m - aktueller Monat";
@@ -790,16 +804,18 @@ App::$strings["Enter New Password"] = "Gib ein neues Passwort ein";
App::$strings["Confirm New Password"] = "Bestätige das neue Passwort";
App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe";
-App::$strings["Used to provide a member experience matched to your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung passend zu Deiner technischen Qualifikationsstufe zu bieten.";
+App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen).";
App::$strings["Remove Account"] = "Konto entfernen";
App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
App::$strings["Affinity Slider settings updated."] = "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert.";
App::$strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
App::$strings["Default maximum affinity level"] = "Voreinstellung für maximalen Beziehungsgrad";
+App::$strings["0-99 default 99"] = "0-99 - Standard 99";
App::$strings["Default minimum affinity level"] = "Voreinstellung für minimalen Beziehungsgrad";
+App::$strings["0-99 - default 0"] = "0-99 - Standard 0";
App::$strings["Affinity Slider Settings"] = "Beziehungsgrad-Schieberegler-Einstellungen";
-App::$strings["Feature/Addon Settings"] = "Funktions-/Addon-Einstellungen";
-App::$strings["No special theme for mobile devices"] = "Kein spezielles Design für mobile Geräte";
+App::$strings["Addon Settings"] = "Addon-Einstellungen";
+App::$strings["Please save/submit changes to any panel before opening another."] = "Bitte speichere alle Änderungen in diesem Bereich, bevor Du einen anderen öffnest.";
App::$strings["%s - (Experimental)"] = "%s – (experimentell)";
App::$strings["Display Settings"] = "Anzeige-Einstellungen";
App::$strings["Theme Settings"] = "Design-Einstellungen";
@@ -807,7 +823,6 @@ App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Design-Einstellunge
App::$strings["Content Settings"] = "Inhaltseinstellungen";
App::$strings["Display Theme:"] = "Anzeige-Design:";
App::$strings["Select scheme"] = "Schema wählen";
-App::$strings["Mobile Theme:"] = "Design für mobile Geräte:";
App::$strings["Preload images before rendering the page"] = "Bilder im voraus laden, bevor die Seite angezeigt wird";
App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird";
App::$strings["Enable user zoom on mobile devices"] = "Zoom auf Mobilgeräten aktivieren";
@@ -1082,10 +1097,10 @@ App::$strings["Photo not available."] = "Foto nicht verfügbar.";
App::$strings["Upload File:"] = "Datei hochladen:";
App::$strings["Select a profile:"] = "Wähle ein Profil:";
App::$strings["Use Photo for Profile"] = "Foto für Profil verwenden";
-App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+App::$strings["Change Profile Photo"] = "Profilfoto ändern";
App::$strings["Use"] = "Verwenden";
-App::$strings["skip this step"] = "diesen Schritt überspringen";
-App::$strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
+App::$strings["Use a photo from your albums"] = "Ein Foto aus meinen Alben verwenden";
+App::$strings["Select existing photo"] = "Wähle ein vorhandenes Foto aus";
App::$strings["Crop Image"] = "Bild zuschneiden";
App::$strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
App::$strings["Done Editing"] = "Bearbeitung fertigstellen";
@@ -1164,6 +1179,7 @@ App::$strings["Connection: %s"] = "Verbindung: %s";
App::$strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
App::$strings["Connection requests will be approved without your interaction"] = "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist.";
App::$strings["Permission role"] = "Berechtigungsrolle";
+App::$strings["Loading"] = "Lädt...";
App::$strings["Add permission role"] = "Berechtigungsrolle hinzufügen";
App::$strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
App::$strings["Available locations:"] = "Verfügbare Klone:";
@@ -1227,7 +1243,13 @@ App::$strings["Help"] = "Hilfe";
App::$strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
App::$strings["Layout Description"] = "Layout-Beschreibung";
App::$strings["Download PDL file"] = "PDL-Datei herunterladen";
+App::$strings["Please refresh page"] = "Bitte die Seite neu laden";
App::$strings["Unknown error"] = "Unbekannter Fehler";
+App::$strings["Token verification failed."] = "Überprüfung des Verifizierungscodes fehlgeschlagen.";
+App::$strings["Email Verification Required"] = "Email-Überprüfung erforderlich";
+App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Ein Verifizierungscode wurde an Deine Emailadresse versendet [%s]. Gib diesen Code hier ein, um die Überprüfung abzuschließen. Bedenke, dass die Zustellung der Mail einige Zeit dauern kann, und überprüfe ggf. auch Spam- und andere Filter-Ordner, falls die Nachricht nicht erscheint.";
+App::$strings["Resend Email"] = "Email erneut versenden";
+App::$strings["Validation token"] = "Verifizierungscode";
App::$strings["Post not found."] = "Beitrag nicht gefunden.";
App::$strings["post"] = "Beitrag";
App::$strings["comment"] = "Kommentar";
@@ -1319,6 +1341,21 @@ App::$strings["My other channels"] = "Meine anderen Kanäle";
App::$strings["Communications"] = "Kommunikation";
App::$strings["Profile Image"] = "Profilfoto:";
App::$strings["Edit Profiles"] = "Profile bearbeiten";
+App::$strings["This page is available only to site members"] = "Diese Seite ist nur für Mitglieder verfügbar";
+App::$strings["Welcome"] = "Willkommen";
+App::$strings["What would you like to do?"] = "Was möchtest Du gerne tun?";
+App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Bitte speichere diese Seite in Deinen Lesezeichen, falls Du später zu ihr zurückkehren möchtest.";
+App::$strings["Upload a profile photo"] = "Ein Profilfoto hochladen";
+App::$strings["Upload a cover photo"] = "Ein Titelbild hochladen";
+App::$strings["Edit your default profile"] = "Dein Standardprofil bearbeiten";
+App::$strings["View friend suggestions"] = "Freundschafts- und Verbindungsvorschläge ansehen";
+App::$strings["View the channel directory"] = "Das Kanalverzeichnis ansehen";
+App::$strings["View/edit your channel settings"] = "Deine Kanaleinstellungen ansehen/bearbeiten";
+App::$strings["View the site or project documentation"] = "Die Website-/Projektdokumentation ansehen";
+App::$strings["Visit your channel homepage"] = "Deine Kanal-Startseite aufrufen";
+App::$strings["View your connections and/or add somebody whose address you already know"] = "Deine Verbindungen ansehen und/oder jemanden hinzufügen, dessen Kanal-Adresse Du bereits kennst";
+App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Deinen persönlichen Beitragsstrom ansehen (dieser kann leer sein, bis Du ein paar Verbindungen hinzugefügt hast)";
+App::$strings["View the public stream. Warning: this content is not moderated"] = "Den öffentlichen Beitragsstrom ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
App::$strings["Page link"] = "Seiten-Link";
App::$strings["Edit Webpage"] = "Webseite bearbeiten";
App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
@@ -1330,6 +1367,7 @@ App::$strings["Make Default"] = "Zum Standard machen";
App::$strings["%d new messages"] = "%d neue Nachrichten";
App::$strings["%d new introductions"] = "%d neue Vorstellungen";
App::$strings["Delegated Channel"] = "Delegierte Kanäle";
+App::$strings["Cards"] = "Karten";
App::$strings["Add Card"] = "Karte hinzufügen";
App::$strings["This directory server requires an access token"] = "Dieser Verzeichnisserver benötigt einen Zugriffstoken";
App::$strings["About this site"] = "Über diese Seite";
@@ -1504,8 +1542,8 @@ App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen
App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
App::$strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
App::$strings["Registration successful. Continue to create your first channel..."] = "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst...";
+App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
App::$strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
App::$strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
App::$strings["Registration on this hub is disabled."] = "Die Registrierung auf diesem Hub ist nicht möglich.";
@@ -1522,7 +1560,7 @@ App::$strings["no"] = "nein";
App::$strings["yes"] = "ja";
App::$strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
App::$strings["Register"] = "Registrieren";
-App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen.";
+App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Diese Website erfordert eine Email-Bestätigung. Bitte prüfe Deine Emails nach Ausfüllen und Absenden des Formulars, um weitere Hinweise zu bekommen.";
App::$strings["Cover Photos"] = "Cover Foto";
App::$strings["female"] = "weiblich";
App::$strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
@@ -1530,7 +1568,7 @@ App::$strings["male"] = "männlich";
App::$strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
App::$strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
App::$strings["cover photo"] = "Cover Foto";
-App::$strings["Upload Cover Photo"] = "Cover Foto hochladen";
+App::$strings["Change Cover Photo"] = "Titelbild ändern";
App::$strings["Documentation Search"] = "Suche in der Dokumentation";
App::$strings["About"] = "Über";
App::$strings["Administrators"] = "Administratoren";
@@ -1568,6 +1606,8 @@ App::$strings["Show in your contacts shared folder"] = "Im geteilten Ordner Dein
App::$strings["No channel."] = "Kein Kanal.";
App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
App::$strings["View Common Connections"] = "Zeige gemeinsame Verbindungen";
+App::$strings["Email verification resent"] = "Email zur Verifizierung wurde erneut versendet";
+App::$strings["Unable to resend email verification message."] = "Erneutes Versenden der Email zur Verifizierung nicht möglich.";
App::$strings["No connections."] = "Keine Verbindungen.";
App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
App::$strings["View Connections"] = "Verbindungen anzeigen";
@@ -1684,15 +1724,21 @@ App::$strings["\$Projectname Notification"] = "\$Projectname-Benachrichtigung";
App::$strings["\$projectname"] = "\$projectname";
App::$strings["Thank You,"] = "Danke.";
App::$strings["%s Administrator"] = "der Administrator von %s";
+App::$strings["This email was sent by %1\$s at %2\$s."] = "Diese Email wurde von %1\$s auf %2\$s gesendet.";
+App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine Benachrichtigungseinstellungen unter folgendem Link an: %s";
+App::$strings["To stop receiving these messages, please adjust your %s."] = "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an.";
App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Benachrichtigung] Neue Mail empfangen auf %s";
App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet.";
App::$strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt.";
App::$strings["a private message"] = "eine private Nachricht";
App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]einen %4\$s[/zrl] kommentiert";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
+App::$strings["commented on"] = "kommentierte";
+App::$strings["liked"] = "gefiel";
+App::$strings["disliked"] = "missfiel";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]ein %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]Dein %5\$s[/zrl]";
App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1\$d von %2\$s";
App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
@@ -1727,6 +1773,8 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte b
App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Benachrichtigung]";
App::$strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
App::$strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
+App::$strings["edited a post dated %s"] = "hat einen Beitrag vom %s bearbeitet";
+App::$strings["edited a comment dated %s"] = "hat einen Kommentar vom %s bearbeitet";
App::$strings["Wiki updated successfully"] = "Wiki erfolgreich aktualisiert";
App::$strings["Wiki files deleted successfully"] = "Wiki-Dateien erfolgreich gelöscht";
App::$strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
@@ -1865,6 +1913,18 @@ App::$strings["Suggestions"] = "Vorschläge";
App::$strings["See more..."] = "Mehr anzeigen …";
App::$strings["Saved Folders"] = "Gespeicherte Ordner";
App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
+App::$strings["Profile Creation"] = "Profilerstellung";
+App::$strings["Upload profile photo"] = "Profilfoto hochladen";
+App::$strings["Upload cover photo"] = "Titelbild hochladen";
+App::$strings["Edit your profile"] = "Profil bearbeiten";
+App::$strings["Find and Connect with others"] = "Finden und Verbinden von/mit Anderen";
+App::$strings["Manage your connections"] = "Deine Verbindungen verwalten";
+App::$strings["Communicate"] = "Kommunizieren";
+App::$strings["View your channel homepage"] = "Deine Kanal-Startseite ansehen";
+App::$strings["View your network stream"] = "Deine Netzwerk-Aktivitäten ansehen";
+App::$strings["Documentation"] = "Dokumentation";
+App::$strings["View public stream. Warning: not moderated"] = "Öffentliche Beitragsaktivitäten ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
+App::$strings["New Member Links"] = "Links für neue Mitglieder";
App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
App::$strings["DB updates"] = "DB-Aktualisierungen";
@@ -1873,7 +1933,7 @@ App::$strings["Plugin Features"] = "Plug-In Funktionen";
App::$strings["Account settings"] = "Konto-Einstellungen";
App::$strings["Channel settings"] = "Kanal-Einstellungen";
App::$strings["Additional features"] = "Zusätzliche Funktionen";
-App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
+App::$strings["Addon settings"] = "Addon-Einstellungen";
App::$strings["Display settings"] = "Anzeige-Einstellungen";
App::$strings["Manage locations"] = "Klon-Adressen verwalten";
App::$strings["Export channel"] = "Kanal exportieren";
@@ -1886,6 +1946,7 @@ App::$strings["New Network Activity Notifications"] = "Benachrichtigungen für n
App::$strings["View your network activity"] = "Zeige Deine Netzwerk-Aktivitäten";
App::$strings["Mark all notifications read"] = "Alle Benachrichtigungen als gesehen markieren";
App::$strings["Show new posts only"] = "Zeige nur neue Beiträge";
+App::$strings["Filter by name"] = "Nach Namen filtern";
App::$strings["New Home Activity"] = "Neue Kanal-Aktivitäten";
App::$strings["New Home Activity Notifications"] = "Benachrichtigungen für neue Kanal-Aktivitäten";
App::$strings["View your home activity"] = "Zeige Deine Kanal-Aktivitäten";
@@ -1909,7 +1970,7 @@ App::$strings["New Registrations"] = "Neue Registrierungen";
App::$strings["New Registrations Notifications"] = "Benachrichtigungen für neue Registrierungen";
App::$strings["Public Stream Notifications"] = "Benachrichtigungen für öffentlichen Beitrags-Stream";
App::$strings["View the public stream"] = "Zeige öffentlichen Beitrags-Stream";
-App::$strings["Loading"] = "Lädt...";
+App::$strings["Sorry, you have got no notifications at the moment"] = "Du hast momentan keine Benachrichtigungen";
App::$strings["Source channel not found."] = "Quellkanal nicht gefunden.";
App::$strings["Create an account to access services and applications"] = "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können.";
App::$strings["Logout"] = "Abmelden";
@@ -1917,7 +1978,6 @@ App::$strings["Login/Email"] = "Anmelden/E-Mail";
App::$strings["Password"] = "Kennwort";
App::$strings["Remember me"] = "Angaben speichern";
App::$strings["Forgot your password?"] = "Passwort vergessen?";
-App::$strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Webseiten-SSL-Fehler für %s";
App::$strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben.";
App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Cron-Jobs laufen nicht auf %s";
@@ -2005,11 +2065,11 @@ App::$strings["Preferred IDs Message"] = "Nachricht für bevorzugte IDs";
App::$strings["Message to display above preferred results."] = "Nachricht, die über den Ergebnissen mit den bevorzugten IDs angezeigt werden soll.";
App::$strings["Uploaded by: "] = "Hochgeladen von: ";
App::$strings["Drawn by: "] = "Gezeichnet von: ";
+App::$strings["Use this image"] = "";
App::$strings["Or select from a free OpenClipart.org image:"] = "Oder wähle ein freies Bild von OpenClipart.org:";
App::$strings["Search Term"] = "Suchbegriff";
App::$strings["Unknown error. Please try again later."] = "Unbekannter Fehler. Bitte versuchen Sie es später erneut.";
App::$strings["Profile photo updated successfully."] = "Profilfoto erfolgreich aktualisiert.";
-App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
App::$strings["Flag Adult Photos"] = "Nicht jugendfreie Fotos markieren";
App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit";
App::$strings["Post to WordPress"] = "Auf WordPress posten";
@@ -2046,6 +2106,8 @@ App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername";
App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort";
App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten";
App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen";
+App::$strings["New registration"] = "";
+App::$strings["Message sent to %s. New account registration: %s"] = "Nachricht gesendet an %s. Neue Kontoregistrierung: %s";
App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken";
App::$strings["Total Hubs"] = "Hubs insgesamt";
App::$strings["Hubzilla Hubs"] = "Hubzilla Hubs";
@@ -2132,8 +2194,8 @@ App::$strings["kiss"] = "küssen";
App::$strings["kissed"] = "geküsst";
App::$strings["tempt"] = "verlocken";
App::$strings["tempted"] = "verlockt";
-App::$strings["raise eyebrows at"] = "";
-App::$strings["raised their eyebrows at"] = "";
+App::$strings["raise eyebrows at"] = "Augenbrauen hochziehen";
+App::$strings["raised their eyebrows at"] = "zog die Augenbrauen hoch";
App::$strings["insult"] = "beleidigen";
App::$strings["insulted"] = "beleidigt";
App::$strings["praise"] = "loben";
@@ -2152,8 +2214,8 @@ App::$strings["fuck"] = "ficken";
App::$strings["fucked"] = "gefickt";
App::$strings["bonk"] = "";
App::$strings["bonked"] = "";
-App::$strings["declare undying love for"] = "";
-App::$strings["declared undying love for"] = "";
+App::$strings["declare undying love for"] = "erkläre unsterbliche Liebe";
+App::$strings["declared undying love for"] = "erklärte unsterbliche Liebe";
App::$strings["Diaspora Protocol Settings updated."] = "Diaspora Protokoll Einstellungen aktualisiert";
App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein.";
App::$strings["Enable the Diaspora protocol for this channel"] = "Das Diaspora Protokoll für diesen Kanal aktivieren";
@@ -2164,8 +2226,8 @@ App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Ve
App::$strings["Diaspora Protocol Settings"] = "Diaspora Protokoll Einstellungen";
App::$strings["No username found in import file."] = "Es wurde kein Nutzername in der importierten Datei gefunden.";
App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
-App::$strings["Your account on %s will expire in a few days."] = "Dein Account auf %s wird in ein paar Tagen ablaufen.";
-App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Account wird bald auslaufen.";
+App::$strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen ablaufen.";
+App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Konto wird bald auslaufen.";
App::$strings["Enable Rainbowtag"] = "Rainbowtag aktivieren";
App::$strings["Rainbowtag Settings"] = "Rainbowtag-Einstellungen";
App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-Einstellungen gespeichert.";
@@ -2187,9 +2249,9 @@ App::$strings["Select default avatar image if none was found at Gravatar. See RE
App::$strings["Rating of images"] = "Bewertungen der Bilder";
App::$strings["Select the appropriate avatar rating for your site. See README"] = "";
App::$strings["Gravatar settings updated."] = "Gravatar-Einstellungen aktualisiert.";
-App::$strings["Hubzilla File Storage Import"] = "";
-App::$strings["This will import all your cloud files from another server."] = "";
-App::$strings["Hubzilla Server base URL"] = "";
+App::$strings["Hubzilla File Storage Import"] = "Hubzilla-Datenspeicher-Import";
+App::$strings["This will import all your cloud files from another server."] = "Hiermit werden alle Deine Cloud-Dateien von einem anderen Server importiert.";
+App::$strings["Hubzilla Server base URL"] = "Basis-URL des Habzilla-Servers";
App::$strings["Since modified date yyyy-mm-dd"] = "";
App::$strings["Until modified date yyyy-mm-dd"] = "";
App::$strings["Recent Channel/Profile Viewers"] = "Kürzliche Kanal/Profil Besucher";
@@ -2208,6 +2270,7 @@ App::$strings["Mail sent."] = "Mail gesendet.";
App::$strings["Sending of mail failed."] = "Senden der E-Mail fehlgeschlagen.";
App::$strings["Mail Test"] = "Mail Test";
App::$strings["Message subject"] = "Betreff der Nachricht";
+App::$strings["Use markdown for editing posts"] = "Verwende Markdown zum Bearbeiten von Beiträgen";
App::$strings["View Larger"] = "Größer anzeigen";
App::$strings["Tile Server URL"] = "Kachelserver-URL";
App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>";
@@ -2258,7 +2321,7 @@ App::$strings["Send public postings to Hubzilla channel by default"] = "";
App::$strings["Hubzilla API Path"] = "Hubzilla-API-Pfad";
App::$strings["Hubzilla login name"] = "Hubzilla-Anmeldename";
App::$strings["Hubzilla channel name"] = "Hubzilla-Kanalname";
-App::$strings["Hubzilla Crosspost Settings"] = "";
+App::$strings["Hubzilla Crosspost Settings"] = "Hubzilla Crosspost Einstellungen";
App::$strings["Logfile archive directory"] = "Verzeichnis der Logdatei";
App::$strings["Directory to store rotated logs"] = "Verzeichnis, in dem rotierte Logs gespeichert werden sollen";
App::$strings["Logfile size in bytes before rotating"] = "zu erreichende Logdateigröße in Bytes, bevor rotiert wird";
@@ -2269,12 +2332,12 @@ App::$strings["Friendica Server base URL"] = "BasisURL des Friendica Servers";
App::$strings["Friendica Login Username"] = "Friendica-Anmeldebenutzername";
App::$strings["Friendica Login Password"] = "Friendica-Anmeldepasswort";
App::$strings["ActivityPub"] = "ActivityPub";
-App::$strings["ActivityPub Protocol Settings updated."] = "";
+App::$strings["ActivityPub Protocol Settings updated."] = "ActivityPub Protokoll Einstellungen aktualisiert";
App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "";
-App::$strings["Enable the ActivityPub protocol for this channel"] = "";
-App::$strings["Send multi-media HTML articles"] = "";
-App::$strings["Not supported by some microblog services such as Mastodon"] = "";
-App::$strings["ActivityPub Protocol Settings"] = "";
+App::$strings["Enable the ActivityPub protocol for this channel"] = "Aktiviere das ActivityPub Protokoll für diesen Kanal";
+App::$strings["Send multi-media HTML articles"] = "Multimedia HTML Artikel versenden";
+App::$strings["Not supported by some microblog services such as Mastodon"] = "Wird von einigen Microblogging-Plattformen wie Mastodon nicht unterstützt";
+App::$strings["ActivityPub Protocol Settings"] = "ActivityPub Protokoll Einstellungen";
App::$strings["Project Servers and Resources"] = "Projektserver und -ressourcen";
App::$strings["Project Creator and Tech Lead"] = "Projektersteller und Technischer Leiter";
App::$strings["Admin, developer, directorymin, support bloke"] = "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende";
@@ -2343,9 +2406,9 @@ App::$strings["Cancel GNU social Connection"] = "GNU social Verbindung trennen";
App::$strings["Currently connected to: "] = "Momentan verbunden mit:";
App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
App::$strings["Allow posting to GNU social"] = "Erlaube die Veröffentlichung bei GNU social";
-App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Account veröffentlicht werden.";
+App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Konto veröffentlicht werden.";
App::$strings["Post to GNU social by default"] = "Standardmäßig bei GNU social veröffentlichen";
-App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Account veröffentlicht.";
+App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Konto veröffentlicht.";
App::$strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
App::$strings["GNU social Post Settings"] = "GNU social Einstellungen";
App::$strings["API URL"] = "API-URL";
@@ -2357,9 +2420,9 @@ App::$strings["Invalid game."] = "Ungültiges Spiel.";
App::$strings["You are not a player in this game."] = "Sie sind kein Spieler in diesem Spiel.";
App::$strings["You must be a local channel to create a game."] = "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein";
App::$strings["You must select one opponent that is not yourself."] = "Du musst einen Gegner wählen, der nicht du selbst ist";
-App::$strings["You must select white or black."] = "Sie müssen weiß oder schwarz auswählen.";
+App::$strings["Random color chosen."] = "";
App::$strings["Error creating new game."] = "Fehler beim Erstellen eines neuen Spiels.";
-App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+App::$strings["Requested channel is not available."] = "Angeforderter Kanal nicht verfügbar.";
App::$strings["You must select a local channel /chess/channelname"] = "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen";
App::$strings["Enable notifications"] = "Benachrichtigungen aktivieren";
App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
@@ -2370,9 +2433,11 @@ App::$strings["Log in with Twitter"] = "Mit Twitter anmelden";
App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopieren";
App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis:</strong> Entsprechend Deiner Privatsphären-Einstellungen (<em>Profil-Details vor nicht angemeldeten Besuchern verbergen?</em>) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist.";
App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter";
-App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden.";
+App::$strings["Twitter post length"] = "";
+App::$strings["Maximum tweet length"] = "";
App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen";
-App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv werden deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden.";
App::$strings["Twitter Post Settings"] = "Twitter-Beitragseinstellungen";
App::$strings["Deactivate the feature"] = "Diese Funktion abschalten";
App::$strings["Hide the button and show the smilies directly."] = "Verstecke die Schaltfläche und zeige die Smilies direkt an.";
@@ -2422,7 +2487,7 @@ App::$strings["If you see this icon you can be sure that the sender is who it sa
App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!";
App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen.";
App::$strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Hubzilla-Servern geteilt.";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit \$Projectname - Servern geteilt.";
App::$strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
App::$strings["New game"] = "Neues Spiel";
@@ -2489,7 +2554,7 @@ App::$strings["Mirror all public posts"] = "Öffentliche Beiträge spiegeln";
App::$strings["Pump.io Post Settings"] = "Pump.io-Beitragseinstellungen";
App::$strings["PumpIO Settings saved."] = "PumpIO-Einstellungen gespeichert.";
App::$strings["An account has been created for you."] = "Ein Konto wurde für Sie erstellt.";
-App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert.";
+App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich, wurde aber abgewiesen! Das Anlegen von Konten wurde deaktiviert.";
App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
App::$strings["Search \$Projectname"] = "\$Projectname suchen";
@@ -2561,8 +2626,8 @@ App::$strings["Uncertain"] = "Ungewiss";
App::$strings["It's complicated"] = "Es ist kompliziert";
App::$strings["Don't care"] = "Interessiert mich nicht";
App::$strings["Ask me"] = "Frag mich mal";
-App::$strings["likes %1\$s's %2\$s"] = "";
-App::$strings["doesn't like %1\$s's %2\$s"] = "";
+App::$strings["likes %1\$s's %2\$s"] = "gefällt %1\$ss %2\$s";
+App::$strings["doesn't like %1\$s's %2\$s"] = "missfällt %1\$ss %2\$s";
App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
App::$strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
App::$strings["poked"] = "stupste";
@@ -2876,7 +2941,7 @@ App::$strings["__ctx:edit_activity__ Comment"] = "Kommentar";
App::$strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
App::$strings["Empty name"] = "Namensfeld leer";
App::$strings["Name too long"] = "Name ist zu lang";
-App::$strings["No account identifier"] = "Keine Account-Kennung";
+App::$strings["No account identifier"] = "Keine Konten-Kennung";
App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
App::$strings["Default Profile"] = "Standard-Profil";
@@ -2886,7 +2951,8 @@ App::$strings["Visible to everybody"] = "Für jeden sichtbar";
App::$strings["Gender:"] = "Geschlecht:";
App::$strings["Homepage:"] = "Homepage:";
App::$strings["Online Now"] = "gerade online";
-App::$strings["Trans"] = "";
+App::$strings["Change your profile photo"] = "Dein Profilfoto ändern";
+App::$strings["Trans"] = "Trans";
App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
App::$strings["j F, Y"] = "j. F Y";
App::$strings["j F"] = "j. F";
@@ -2929,7 +2995,7 @@ App::$strings["GNU-Social"] = "GNU-Social";
App::$strings["RSS/Atom"] = "RSS/Atom";
App::$strings["Diaspora"] = "Diaspora";
App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot!";
+App::$strings["Zot"] = "Zot";
App::$strings["LinkedIn"] = "LinkedIn";
App::$strings["XMPP/IM"] = "XMPP/IM";
App::$strings["MySpace"] = "MySpace";
@@ -2943,12 +3009,14 @@ App::$strings["Post permissions %s cannot be changed %s after a post is shared.<
App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
App::$strings["Image/photo"] = "Bild/Foto";
App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
-App::$strings["Install %1\$s element %2\$s"] = "";
+App::$strings["Install %1\$s element %2\$s"] = "Installiere %1\$s Element %2\$s";
App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
App::$strings["card"] = "Karte";
App::$strings["article"] = "Artikel";
App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
App::$strings["spoiler"] = "Spoiler";
+App::$strings["View article"] = "Artikel ansehen";
+App::$strings["View summary"] = "Zusammenfassung ansehen";
App::$strings["$1 wrote:"] = "$1 schrieb:";
App::$strings[" by "] = "von";
App::$strings[" on "] = "am";
@@ -2956,8 +3024,6 @@ App::$strings["Embedded content"] = "Eingebetteter Inhalt";
App::$strings["Embedding disabled"] = "Einbetten deaktiviert";
App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$s willkommen";
App::$strings["General Features"] = "Allgemeine Funktionen";
-App::$strings["Multiple Profiles"] = "Mehrfachprofile";
-App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal";
App::$strings["Advanced Profiles"] = "Erweiterte Profile";
App::$strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
App::$strings["Profile Import/Export"] = "Profil-Import/Export";
@@ -2968,21 +3034,33 @@ App::$strings["Provide a wiki for your channel"] = "Stelle ein Wiki in Deinem Ka
App::$strings["Private Notes"] = "Private Notizen";
App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)";
App::$strings["Create personal planning cards"] = "Erstelle persönliche (Notiz-)Karten zur Planung/Koordination oder ähnlichen Zwecken";
+App::$strings["Create interactive articles"] = "Erstelle interaktive Artikel";
App::$strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
App::$strings["Change channels directly from within the navigation dropdown menu"] = "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü";
App::$strings["Photo Location"] = "Aufnahmeort";
App::$strings["If location data is available on uploaded photos, link this to a map."] = "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte";
App::$strings["Access Controlled Chatrooms"] = "Zugriffskontrollierte Chaträume";
App::$strings["Provide chatrooms and chat services with access control."] = "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an.";
-App::$strings["Provide alternate connection permission roles."] = "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung.";
App::$strings["Smart Birthdays"] = "Smarte Geburtstage";
App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind.";
App::$strings["Event Timezone Selection"] = "Termin-Zeitzonenauswahl";
App::$strings["Allow event creation in timezones other than your own."] = "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen.";
+App::$strings["Premium Channel"] = "Premium-Kanal";
+App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
App::$strings["Advanced Directory Search"] = "Erweiterte Verzeichnissuche";
App::$strings["Allows creation of complex directory search queries"] = "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen";
App::$strings["Advanced Theme and Layout Settings"] = "Erweiterte Design- und Layout-Einstellungen";
App::$strings["Allows fine tuning of themes and page layouts"] = "Erlaubt die Feineinstellung von Designs und Seitenlayouts";
+App::$strings["Access Control and Permissions"] = "Zugriffskontrolle und Berechtigungen";
+App::$strings["Privacy Groups"] = "Gruppen";
+App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
+App::$strings["Multiple Profiles"] = "Mehrfachprofile";
+App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal";
+App::$strings["Provide alternate connection permission roles."] = "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung.";
+App::$strings["OAuth Clients"] = "OAuth Clients";
+App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Verwalte Tokens für den Zugriff von mobilen bzw. externen Anwendungen.";
+App::$strings["Access Tokens"] = "Zugangstokens";
+App::$strings["Create access tokens so that non-members can access private content."] = "Erzeuge Tokens für den Zugriff von Nicht-Mitgliedern auf private Inhalte.";
App::$strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
App::$strings["Large Photos"] = "Große Fotos";
App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet.";
@@ -3002,8 +3080,6 @@ App::$strings["Prevent posts with identical content to be published with less th
App::$strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
App::$strings["Search by Date"] = "Suche nach Datum";
App::$strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
-App::$strings["Privacy Groups"] = "Gruppen";
-App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
App::$strings["Save search terms for re-use"] = "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung";
App::$strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast";
@@ -3015,7 +3091,6 @@ App::$strings["Show friend and connection suggestions"] = "Freund- und Verbindun
App::$strings["Connection Filtering"] = "Filter für Verbindungen";
App::$strings["Filter incoming posts from connections based on keywords/content"] = "Ermöglicht die Filterung eingehender Beiträge anhand von Schlüsselwörtern (muss an der Verbindung konfiguriert werden)";
App::$strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
-App::$strings["Use markdown for editing posts"] = "Verwende Markdown zum Bearbeiten von Beiträgen";
App::$strings["Community Tagging"] = "Gemeinschaftliches Verschlagworten";
App::$strings["Ability to tag existing posts"] = "Ermöglicht das Verschlagworten existierender Beiträge";
App::$strings["Post Categories"] = "Beitrags-Kategorien";
@@ -3029,8 +3104,6 @@ App::$strings["Star Posts"] = "Beiträge mit Sternchen versehen";
App::$strings["Ability to mark special posts with a star indicator"] = "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol";
App::$strings["Tag Cloud"] = "Schlagwort-Wolke";
App::$strings["Provide a personal tag cloud on your channel page"] = "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite";
-App::$strings["Premium Channel"] = "Premium-Kanal";
-App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
App::$strings["Tags"] = "Schlagwörter";
App::$strings["Keywords"] = "Schlüsselwörter";
App::$strings["have"] = "habe";
@@ -3092,25 +3165,11 @@ App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
App::$strings["Remote authentication"] = "Über Konto auf anderem Server einloggen";
App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
-App::$strings["Network Activity"] = "Netzwerk-Aktivitäten";
-App::$strings["Mark all activity notifications seen"] = "Alle Benachrichtigungen als gesehen markieren";
-App::$strings["Channel home"] = "Mein Kanal";
-App::$strings["View your channel home"] = "Zeige Deine Kanalseite an";
-App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
-App::$strings["Registrations"] = "Registrierungen";
-App::$strings["Notifications"] = "Benachrichtigungen";
-App::$strings["View all notifications"] = "Alle Benachrichtigungen ansehen";
-App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
-App::$strings["Private mail"] = "Persönliche Mail";
-App::$strings["View your private messages"] = "Zeige Deine persönlichen Nachrichten an";
-App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
-App::$strings["Event Calendar"] = "Terminkalender";
App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
App::$strings["End this session"] = "Beende diese Sitzung";
App::$strings["Your profile page"] = "Deine Profilseite";
App::$strings["Manage/Edit profiles"] = "Profile verwalten";
-App::$strings["Edit your profile"] = "Profil bearbeiten";
App::$strings["Sign in"] = "Anmelden";
App::$strings["Take me home"] = "Bringe mich nach Hause (eigener Kanal)";
App::$strings["Log me out of this site"] = "Logge mich von dieser Seite aus";
@@ -3132,6 +3191,7 @@ App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen.";
App::$strings["Add new connections to this privacy group"] = "Neue Verbindung zu dieser Gruppe hinzufügen";
App::$strings["edit"] = "Bearbeiten";
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 01def9900..2d017db18 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -74,6 +74,10 @@ function bbco_format(item) {
return "<div class='dropdown-item'>" + item + "</div>";
}
+function tag_format(item) {
+ return "<div class='dropdown-item'>" + '#' + item.text + "</div>";
+}
+
function editor_replace(item) {
if(typeof item.replace !== 'undefined') {
return '$1$2' + item.replace;
@@ -202,6 +206,16 @@ function string2bb(element) {
};
+ // Autocomplete hashtags
+ tags = {
+ match: /(^|\s)(\#)([^ \n]{2,})$/,
+ index: 3,
+ search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); },
+ replace: function(item) { return "$1$2" + item.text + ' '; },
+ template: tag_format
+ };
+
+
smilies = {
match: /(^|\s)(:[a-z_:]{2,})$/,
index: 2,
@@ -211,7 +225,7 @@ function string2bb(element) {
template: smiley_format
};
this.attr('autocomplete','off');
- this.textcomplete([contacts,forums,smilies], {className:'acpopup', zIndex:1020});
+ this.textcomplete([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020});
};
})( jQuery );
diff --git a/view/js/main.js b/view/js/main.js
index f6fe475d8..98a756fff 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -304,6 +304,12 @@ function insertCommentURL(comment, id) {
return true;
}
+function doFollowAuthor(url) {
+ $.get(url, function(data) { notificationsUpdate(); });
+ return true;
+}
+
+
function viewsrc(id) {
$.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' });
}
diff --git a/view/js/mod_cover_photo.js b/view/js/mod_cover_photo.js
deleted file mode 100644
index 5b64b8b91..000000000
--- a/view/js/mod_cover_photo.js
+++ /dev/null
@@ -1,80 +0,0 @@
- var initializeEmbedPhotoDialog = function () {
- $('.embed-photo-selected-photo').each(function (index) {
- $(this).removeClass('embed-photo-selected-photo');
- });
- getPhotoAlbumList();
- $('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal('show');
- };
-
- var choosePhotoFromAlbum = function (album) {
- $.post("embedphotos/album", {name: album},
- function(data) {
- if (data['status']) {
- $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
- $('#embedPhotoModalBodyAlbumDialog').html('\
- <div><div class="nav nav-pills flex-column">\n\
- <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
- <i class="fa fa-chevron-left"></i>&nbsp\n\
- {{$modaldiffalbum}}\n\
- </a>\n\
- </li>\n\
- </div><br></div>')
- $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
- $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
- evt.preventDefault();
- var image = document.getElementById(evt.target.id);
- if (typeof($(image).parent()[0]) !== 'undefined') {
- var imageparent = document.getElementById($(image).parent()[0].id);
- $(imageparent).toggleClass('embed-photo-selected-photo');
- var href = $(imageparent).attr('href');
- $.post("embedphotos/photolink", {href: href},
- function(ddata) {
- if (ddata['status']) {
- window.location.href = 'cover_photo/use/' + ddata['resource_id'];
- } else {
- window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
- }
- return false;
- },
- 'json');
- $('#embedPhotoModalBodyAlbumDialog').html('');
- $('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal('hide');
- }
- });
-
- $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
- $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
- } else {
- window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
- }
- return false;
- },
- 'json');
- };
-
- var getPhotoAlbumList = function () {
- $.post("embedphotos/albumlist", {},
- function(data) {
- if (data['status']) {
- var albums = data['albumlist']; //JSON.parse(data['albumlist']);
- $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
- $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
- for(var i=0; i<albums.length; i++) {
- var albumName = albums[i].text;
- var jsAlbumName = albums[i].jstext;
- var albumLink = '<li class="nav-item">';
- albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
- albumLink += '</li>';
- $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
- }
- $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
- $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
- } else {
- window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
- }
- return false;
- },
- 'json');
- };
diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js
deleted file mode 100644
index c05c8e25e..000000000
--- a/view/js/mod_profile_photo.js
+++ /dev/null
@@ -1,82 +0,0 @@
- var initializeEmbedPhotoDialog = function () {
- $('.embed-photo-selected-photo').each(function (index) {
- $(this).removeClass('embed-photo-selected-photo');
- });
- getPhotoAlbumList();
- $('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal('show');
- };
-
- var choosePhotoFromAlbum = function (album) {
- $.post("embedphotos/album", {name: album},
- function(data) {
- if (data['status']) {
- $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
- $('#embedPhotoModalBodyAlbumDialog').html('\
- <div><div class="nav nav-pills flex-column">\n\
- <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
- <i class="fa fa-chevron-left"></i>&nbsp\n\
- {{$modaldiffalbum}}\n\
- </a>\n\
- </li>\n\
- </div><br></div>')
- $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
- $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
- evt.preventDefault();
- var image = document.getElementById(evt.target.id);
- if (typeof($(image).parent()[0]) !== 'undefined') {
- var imageparent = document.getElementById($(image).parent()[0].id);
- $(imageparent).toggleClass('embed-photo-selected-photo');
- var href = $(imageparent).attr('href');
- $.post("embedphotos/photolink", {href: href},
- function(ddata) {
- if (ddata['status']) {
- var pf = $('#profile-photo-profiles').val();
- var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : '');
- window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof;
- } else {
- window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
- }
- return false;
- },
- 'json');
- $('#embedPhotoModalBodyAlbumDialog').html('');
- $('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal('hide');
- }
- });
-
- $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
- $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
- } else {
- window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
- }
- return false;
- },
- 'json');
- };
-
- var getPhotoAlbumList = function () {
- $.post("embedphotos/albumlist", {},
- function(data) {
- if (data['status']) {
- var albums = data['albumlist']; //JSON.parse(data['albumlist']);
- $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
- $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
- for(var i=0; i<albums.length; i++) {
- var albumName = albums[i].text;
- var jsAlbumName = albums[i].jstext;
- var albumLink = '<li class="nav-item">';
- albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
- albumLink += '</li>';
- $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
- }
- $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
- $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
- } else {
- window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
- }
- return false;
- },
- 'json');
- };
diff --git a/view/pdl/mod_moderate.pdl b/view/pdl/mod_moderate.pdl
new file mode 100644
index 000000000..95f069031
--- /dev/null
+++ b/view/pdl/mod_moderate.pdl
@@ -0,0 +1,4 @@
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
diff --git a/view/pdl/mod_thing.pdl b/view/pdl/mod_thing.pdl
new file mode 100644
index 000000000..7e15fc869
--- /dev/null
+++ b/view/pdl/mod_thing.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 1e066c570..f2c46da28 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -15,7 +15,7 @@ head_add_js('jquery.js');
head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
head_add_js('/library/sprintf.js/dist/sprintf.min.js');
-head_add_js('jquery.textinputs.js');
+//head_add_js('jquery.textinputs.js');
head_add_js('autocomplete.js');
head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg
deleted file mode 100644
index ac9258bd6..000000000
--- a/view/theme/redbasic/img/screenshot.jpg
+++ /dev/null
Binary files differ
diff --git a/view/theme/redbasic/img/screenshot.png b/view/theme/redbasic/img/screenshot.png
new file mode 100644
index 000000000..60d7e23f6
--- /dev/null
+++ b/view/theme/redbasic/img/screenshot.png
Binary files differ
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 0a142a07f..d0154bfb1 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -15,13 +15,26 @@ textarea, input, select
padding: 10px 0;
}
+#jot-title {
+ border-radius: 3px;
+}
+
#jot-title-wrap {
border-bottom: none;
margin-bottom: 5px;
}
+#jot-category-wrap {
+ border-bottom: none;
+ margin-bottom: 5px;
+}
+
+.bootstrap-tagsinput {
+ background: #333;
+}
+
optgroup {
- color: #CCC !important;
+ color: #CCC !important;
}
option {
@@ -132,7 +145,7 @@ option {
.abook-self {
border: 1px solid #222;
color: #555;
- background-color:#111;
+ background-color:#111;
}
.modal-content {
@@ -208,7 +221,7 @@ a.btn, aside a {
}
.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
color: #FFF !important;
- background-color: #C9302C !important;
+ background-color: #C9302C !important;
border-color: #AC2925 !important;
}
@@ -278,7 +291,7 @@ nav .dropdown-menu {
border-bottom:1px solid #333;
}
-.nav-tabs .nav-link.active {
+.nav-tabs .nav-link.active {
color: #fff;
background-color: #111;
border-color: #333;
@@ -297,7 +310,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
background-color: #222;
}
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
font-weight: bold;
}
@@ -343,6 +356,10 @@ pre {
border:1px solid #090909;
}
+#wiki-content-container code {
+ background: #000;
+}
+
.notif-item a {
color: #ccc;
}
@@ -352,23 +369,23 @@ pre {
}
.dropdown-menu {
- background-color: #222;
+ background-color: #222;
}
.dropdown-menu >li > a {
- color: #ccc;
+ color: #ccc;
}
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
- color: #ddd;
- background-color: #333;
+ color: #ddd;
+ background-color: #333;
background-image: none;
}
.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
- color: #ccc;
- background-color: #222;
- border-color: #222;
+ color: #ccc;
+ background-color: #222;
+ border-color: #222;
}
.pmenu-item:hover a {
@@ -444,7 +461,7 @@ pre {
.profile-match-wrapper {
- width: 150px;
+ width: 150px;
height: 120px;
border: none;
}
@@ -462,5 +479,3 @@ pre {
.widget-nav-pills-checkbox:hover + a {
background-color: #222;
}
-
-
diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl
index 2d5cf7e0b..86f978e08 100644
--- a/view/tpl/admin_settings_features.tpl
+++ b/view/tpl/admin_settings_features.tpl
@@ -9,12 +9,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+ <a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
{{$f.0}}
</a>
</h3>
</div>
- <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+ <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} show{{/if}}" data-parent="#settings" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
<div class="section-content-tools-wrapper">
{{foreach $f.1 as $fcat}}
{{include file="field_checkbox.tpl" field=$fcat.0}}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 78e3ee245..fb96ef2cf 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -55,7 +55,7 @@
{{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme}}
- {{include file="field_select.tpl" field=$theme_mobile}}
+ {{* include file="field_select.tpl" field=$theme_mobile *}}
{{include file="field_input.tpl" field=$frontpage}}
{{include file="field_checkbox.tpl" field=$mirror_frontpage}}
{{include file="field_checkbox.tpl" field=$login_on_homepage}}
@@ -74,7 +74,7 @@
{{include file="field_select.tpl" field=$access_policy}}
{{include file="field_input.tpl" field=$location}}
{{include file="field_input.tpl" field=$sellpage}}
- {{include file="field_input.tpl" field=$firstpage}}
+ {{include file="field_input.tpl" field=$first_page}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index cbcf46320..829a3a556 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -1,3 +1,86 @@
+<script>
+ var initializeEmbedPhotoDialog = function () {
+ $('.embed-photo-selected-photo').each(function (index) {
+ $(this).removeClass('embed-photo-selected-photo');
+ });
+ getPhotoAlbumList();
+ $('#embedPhotoModalBodyAlbumDialog').off('click');
+ $('#embedPhotoModal').modal('show');
+ };
+
+ var choosePhotoFromAlbum = function (album) {
+ $.post("embedphotos/album", {name: album},
+ function(data) {
+ if (data['status']) {
+ $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+ $('#embedPhotoModalBodyAlbumDialog').html('\
+ <div><div class="nav nav-pills flex-column">\n\
+ <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+ <i class="fa fa-chevron-left"></i>&nbsp\n\
+ {{$modaldiffalbum}}\n\
+ </a>\n\
+ </li>\n\
+ </div><br></div>')
+ $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+ $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+ evt.preventDefault();
+ var image = document.getElementById(evt.target.id);
+ if (typeof($(image).parent()[0]) !== 'undefined') {
+ var imageparent = document.getElementById($(image).parent()[0].id);
+ $(imageparent).toggleClass('embed-photo-selected-photo');
+ var href = $(imageparent).attr('href');
+ $.post("embedphotos/photolink", {href: href},
+ function(ddata) {
+ if (ddata['status']) {
+ window.location.href = 'cover_photo/use/' + ddata['resource_id'];
+ } else {
+ window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ $('#embedPhotoModalBodyAlbumDialog').html('');
+ $('#embedPhotoModalBodyAlbumDialog').off('click');
+ $('#embedPhotoModal').modal('hide');
+ }
+ });
+
+ $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+ $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+ } else {
+ window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ };
+
+ var getPhotoAlbumList = function () {
+ $.post("embedphotos/albumlist", {},
+ function(data) {
+ if (data['status']) {
+ var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+ $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+ $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+ for(var i=0; i<albums.length; i++) {
+ var albumName = albums[i].text;
+ var jsAlbumName = albums[i].jstext;
+ var albumLink = '<li class="nav-item">';
+ albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+ albumLink += '</li>';
+ $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+ }
+ $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+ $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+ } else {
+ window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ };
+</script>
+
<div id="profile-photo-content" class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl
index bf39b2aea..875c97feb 100644
--- a/view/tpl/generic_addon_settings.tpl
+++ b/view/tpl/generic_addon_settings.tpl
@@ -1,12 +1,16 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
<h3>
- <a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
+ <a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content">
+ {{if $addon.1|substr:0:1 === '<'}}
{{$addon.1}}
+ {{else}}
+ <i class="fa fa-gear"></i> {{$addon.1}}
+ {{/if}}
</a>
</h3>
</div>
- <div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
+ <div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings" data-parent="#settings">
<div class="section-content-tools-wrapper">
{{$content}}
{{if $addon.0}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index b0b3198c6..92b067bcb 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -80,7 +80,7 @@
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser || $nav.pubs}}
- <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white notifications-btn">
+ <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
</button>
{{/if}}
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl
index b0b3198c6..92b067bcb 100755
--- a/view/tpl/navbar_tucson.tpl
+++ b/view/tpl/navbar_tucson.tpl
@@ -80,7 +80,7 @@
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser || $nav.pubs}}
- <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white notifications-btn">
+ <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
</button>
{{/if}}
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 18250cf97..215fddd08 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,3 +1,4 @@
+{{if $notifications}}
<script>
var notifications_parent;
@@ -121,8 +122,6 @@
}
</script>
-
-{{if $notifications}}
<div id="notifications_wrapper">
<div id="no_notifications" class="d-xl-none">
{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 5f420f6d0..b4d9ef19f 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -10,7 +10,7 @@
</form>
<ul class="nav nav-pills flex-column">
{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
- {{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
+ {{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?f=&suggest=1" >{{$suggest}}</a></li>{{/if}}
<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
</ul>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 05137479f..95183fdf4 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -49,12 +49,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="personal">
<h3>
- <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+ <a data-toggle="collapse" data-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse">
{{$personal}}
</a>
</h3>
</div>
- <div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+ <div id="personal-collapse" class="panel-collapse collapse show" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="personal">
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$profile_name}}
@@ -215,12 +215,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="location">
<h3>
- <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+ <a data-toggle="collapse" data-target="#location-collapse" href="#" aria-expanded="true" aria-controls="location-collapse">
{{$location}}
</a>
</h3>
</div>
- <div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+ <div id="location-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="location">
<div class="section-content-tools-wrapper">
{{if $fields.address}}
{{include file="field_input.tpl" field=$address}}
@@ -260,12 +260,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="relation">
<h3>
- <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+ <a data-toggle="collapse" data-target="#relation-collapse" href="#" aria-expanded="true" aria-controls="relation-collapse">
{{$relation}}
</a>
</h3>
</div>
- <div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+ <div id="relation-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="relation">
<div class="section-content-tools-wrapper">
{{if $fields.marital }}
<div id="profile-edit-marital-wrapper" class="form-group field" >
@@ -307,12 +307,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
<h3>
- <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+ <a data-toggle="collapse" data-target="#miscellaneous-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-collapse">
{{$miscellaneous}}
</a>
</h3>
</div>
- <div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+ <div id="miscellaneous-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="miscellaneous">
<div class="section-content-tools-wrapper">
{{if $fields.homepage}}
{{include file="field_input.tpl" field=$homepage}}
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index edde6af3f..e48d05330 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,3 +1,89 @@
+<script>
+ var initializeEmbedPhotoDialog = function () {
+ $('.embed-photo-selected-photo').each(function (index) {
+ $(this).removeClass('embed-photo-selected-photo');
+ });
+ getPhotoAlbumList();
+ $('#embedPhotoModalBodyAlbumDialog').off('click');
+ $('#embedPhotoModal').modal('show');
+ };
+
+ var choosePhotoFromAlbum = function (album) {
+ $.post("embedphotos/album", {name: album},
+ function(data) {
+ if (data['status']) {
+ $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+ $('#embedPhotoModalBodyAlbumDialog').html('\
+ <div><div class="nav nav-pills flex-column">\n\
+ <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+ <i class="fa fa-chevron-left"></i>&nbsp\n\
+ {{$modaldiffalbum}}\n\
+ </a>\n\
+ </li>\n\
+ </div><br></div>')
+ $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+ $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+ evt.preventDefault();
+ var image = document.getElementById(evt.target.id);
+ if (typeof($(image).parent()[0]) !== 'undefined') {
+ var imageparent = document.getElementById($(image).parent()[0].id);
+ $(imageparent).toggleClass('embed-photo-selected-photo');
+ var href = $(imageparent).attr('href');
+ $.post("embedphotos/photolink", {href: href},
+ function(ddata) {
+ if (ddata['status']) {
+ var pf = $('#profile-photo-profiles').val();
+ var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : '');
+ window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof;
+ } else {
+ window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ $('#embedPhotoModalBodyAlbumDialog').html('');
+ $('#embedPhotoModalBodyAlbumDialog').off('click');
+ $('#embedPhotoModal').modal('hide');
+ }
+ });
+
+ $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+ $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+ } else {
+ window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ };
+
+ var getPhotoAlbumList = function () {
+ $.post("embedphotos/albumlist", {},
+ function(data) {
+ if (data['status']) {
+ var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+ $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+ $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+ for(var i=0; i<albums.length; i++) {
+ var albumName = albums[i].text;
+ var jsAlbumName = albums[i].jstext;
+ var albumLink = '<li class="nav-item">';
+ albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+ albumLink += '</li>';
+ $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+ }
+ $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+ $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+ } else {
+ window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+ }
+ return false;
+ },
+ 'json');
+ };
+</script>
+
+
<div id="profile-photo-content" class="generic-content-wrapper">
<div class="section-title-wrapper">
<h2>{{$title}}</h2>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 0f42a6e8a..130dc6918 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -11,12 +11,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
+ <a data-toggle="collapse" data-target="#basic-settings-collapse" href="#">
{{$h_basic}}
</a>
</h3>
</div>
- <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
+ <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-parent="#settings">
<div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$username}}
{{include file="field_select_grouped.tpl" field=$timezone}}
@@ -37,12 +37,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
+ <a data-toggle="collapse" data-target="#privacy-settings-collapse" href="#">
{{$h_prv}}
</a>
</h3>
</div>
- <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
+ <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings">
<div class="section-content-tools-wrapper">
{{include file="field_select_grouped.tpl" field=$role}}
<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
@@ -96,12 +96,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
+ <a data-toggle="collapse" data-target="#notification-settings-collapse" href="#">
{{$h_not}}
</a>
</h3>
</div>
- <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
+ <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-parent="#settings">
<div class="section-content-tools-wrapper">
<div id="settings-notifications">
@@ -160,12 +160,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+ <a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
{{$lbl_misc}}
</a>
</h3>
</div>
- <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+ <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" >
<div class="section-content-tools-wrapper">
{{if $profselect}}
<label for="contact-profile-selector">{{$profseltxt}}</label>
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 2a925f1f7..27cfa238a 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,8 +1,8 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <div class="descriptive-text pull-right">{{$descrip}}</div>
<h2>{{$title}}</h2>
</div>
+ <div class="section-content-info-wrapper">{{$descrip}}</div>
<form action="settings/featured" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div class="panel-group" id="settings" role="tablist">
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index b0751eb5f..7600038ea 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -10,12 +10,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
+ <a data-toggle="collapse" data-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content">
{{$d_tset}}
</a>
</h3>
</div>
- <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
+ <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings" data-parent="#settings" >
<div class="section-content-tools-wrapper">
{{if $theme}}
{{include file="field_themeselect.tpl" field=$theme}}
@@ -33,12 +33,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+ <a data-toggle="collapse" data-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content">
{{$d_ctset}}
</a>
</h3>
</div>
- <div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+ <div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-parent="#settings" >
<div class="section-content-tools-wrapper">
{{if $theme_config}}
{{$theme_config}}
@@ -49,12 +49,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
+ <a data-toggle="collapse" data-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content">
{{$d_cset}}
</a>
</h3>
</div>
- <div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+ <div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings" data-parent="#settings">
<div class="section-content-wrapper">
{{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}}
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index dfe049a7a..f8c162e17 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -9,12 +9,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
<h3>
- <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+ <a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
{{$f.0}}
</a>
</h3>
</div>
- <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+ <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title" data-parent="#settings">
<div class="section-content-tools-wrapper">
{{foreach $f.1 as $fcat}}
{{include file="field_checkbox.tpl" field=$fcat}}